Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup

This commit is contained in:
Peter 'Pita' Martischka 2013-02-10 22:41:49 +00:00
commit 17a02bb024
34 changed files with 187 additions and 9692 deletions

View file

@ -45,5 +45,5 @@
"engines" : { "node" : ">=0.6.3",
"npm" : ">=1.0"
},
"version" : "1.2.7"
"version" : "1.2.8"
}