mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-01 12:49:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 75

Merge branch 'feature/support-node-0.10' into develop

Browse source 
Conflicts:
	src/package.json
This commit is contained in:
Marcel Klehr 2013-04-01 13:29:07 +02:00
commit 04a53c4402
6 changed files with 7 additions and 7 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" : "0.2.x",
"socket.io" : "0.9.x",
"ueberDB" : "0.1.96",
"ueberDB" : "0.2.x",
"async" : "0.1.x",
"express" : "3.x",
"connect" : "2.4.x",