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

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

1
node/handler/APIHandler.js
View file

@ -51,6 +51,7 @@ var functions = {
"getText" : ["padID", "rev"],
"setText" : ["padID", "text"],
"getHTML" : ["padID", "rev"],
"setHTML" : ["padID", "html"],
"getRevisionsCount" : ["padID"],
"deletePad" : ["padID"],
"getReadOnlyID" : ["padID"],