mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-01 20:59:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 67

resolve merge issues

Browse source
This commit is contained in:
John McLear 2014-11-15 15:34:18 +00:00
commit cce2d7279a
13 changed files with 205 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/package.json
View file

@ -16,7 +16,7 @@
"require-kernel" : "1.0.5",
"resolve" : ">=1.0.0",
"socket.io" : ">=1.2.0",
"ueberDB" : ">=0.2.6",
"ueberDB" : ">=0.2.9",
"express" : ">3.1.0 <3.9.0",
"async" : "0.1.x",
"connect" : "2.7.x",