mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-07 23:55:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fixed merge confilicts

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-11-25 16:56:08 -08:00
commit 7296913cb0
6 changed files with 820 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
package.json
View file

@ -19,7 +19,8 @@
"uglify-js" : "1.1.1",
"gzip" : "0.1.0",
"formidable" : "1.0.7",
"log4js" : "0.3.9"
"log4js" : "0.3.9",
"jsdom" : "0.2.9"
},
"version" : "1.0.0"
}