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 'metrics' into develop

Browse source 
Conflicts:
	src/node/handler/PadMessageHandler.js
This commit is contained in:
Marcel Klehr 2013-10-28 12:11:25 +01:00
commit 7b84e7308b
9 changed files with 80 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/package.json
View file

@ -38,7 +38,8 @@
"unorm" : "1.0.0",
"languages4translatewiki" : "0.1.3",
"swagger-node-express" : "1.2.3",
"channels" : "0.0.x"
"channels" : "0.0.x",
"measured" : "0.1.3"
},
"bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": {