mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-11 17:51:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of git://github.com/Pita/etherpad-lite

Browse source
This commit is contained in:
Egil Moeller 2012-03-27 22:36:48 +02:00
commit 6120a0b7aa
20 changed files with 1197 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

6
settings.json.template
View file

@ -39,9 +39,9 @@
but makes it impossible to debug the javascript/css */
"minify" : true,
/* How long may clients use served javascript code? Without versioning this
is may cause problems during deployment. */
"maxAge" : 21600000, // 6 hours
/* How long may clients use served javascript code (in seconds)? Without versioning this
is may cause problems during deployment. Set to 0 to disable caching */
"maxAge" : 21600, // 6 hours
/* This is the path to the Abiword executable. Setting it to null, disables abiword.
Abiword is needed to enable the import/export of pads*/