diff options
author | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-04-08 21:50:41 +0200 |
commit | 315d496290747aab8b3147dc24b822460071bb2d (patch) | |
tree | 4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /htconfig.php | |
parent | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff) | |
parent | 5c0446975516f2b52b6cf51618e0b75af56de71b (diff) | |
download | volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2 volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'htconfig.php')
-rw-r--r-- | htconfig.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/htconfig.php b/htconfig.php index 9d9c8a2c7..63a40c809 100644 --- a/htconfig.php +++ b/htconfig.php @@ -83,5 +83,8 @@ $a->config['system']['no_regfullname'] = true; // If set to true the priority settings of ostatus contacts are used $a->config['system']['ostatus_use_priority'] = false; -// If enabled all items are cached in the given directory +// If enabled, all items are cached in the given directory $a->config['system']['itemcache'] = ""; + +// If enabled, the lockpath is used for a lockfile to check if the poller is running +$a->config['system']['lockpath'] = ""; |