summaryrefslogtreecommitdiff
path: root/settings.json.template
diff options
context:
space:
mode:
authorWikinaut <mail@tgries.de>2012-12-07 08:59:13 +0100
committerWikinaut <mail@tgries.de>2012-12-07 08:59:13 +0100
commit5bf79971b8e2ea68096acadd3d5a6d83386ddd5a (patch)
treeaa2e202dcbc6ed4d3df4db98cf163f5875ad76b6 /settings.json.template
parent0d2eddb62a286f48f742941cedc5af96958dcad0 (diff)
parent98e03c1d874f7f531010e88b9f3bdff00f4f134b (diff)
downloadetherpad-lite-5bf79971b8e2ea68096acadd3d5a6d83386ddd5a.zip
merged upstream develop
Diffstat (limited to 'settings.json.template')
-rw-r--r--settings.json.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings.json.template b/settings.json.template
index b1c2404f..897533f5 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -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.