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

merged upstream develop

Browse source
This commit is contained in:
Wikinaut 2012-12-07 08:59:13 +01:00
commit 5bf79971b8
20 changed files with 246 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

2
settings.json.template
View file

@ -68,7 +68,7 @@
"maxAge" : 21600, // 60 * 60 * 6 = 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*/
Abiword is needed to advanced import/export features of pads*/
"abiword" : null,
/* This setting is used if you require authentication of all users.