Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n

This commit is contained in:
John McLear 2012-11-14 10:19:52 +00:00
commit 2657f06887
1 changed files with 1 additions and 1 deletions

View File

@ -17,7 +17,7 @@
"resolve" : "0.2.x",
"socket.io" : "0.9.x",
"ueberDB" : "0.1.8",
"async" : "0.1.22",
"async" : "0.1.x",
"express" : "3.x",
"connect" : "2.4.x",
"clean-css" : "0.3.2",