mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-22 14:10:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests

Browse source
This commit is contained in:
John McLear 2014-11-26 15:33:13 +00:00
commit 88b3d99fbd
7 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/package.json
View file

@ -25,7 +25,7 @@
"formidable" : "1.0.9",
"log4js" : "0.6.6",
"nodemailer" : "0.3.x",
"jsdom-nocontextifiy" : "0.2.10",
"cheerio" : "0.18.0",
"async-stacktrace" : "0.0.2",
"npm" : "1.4.x",
"ejs" : "0.6.1",