diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
commit | e05415f621890bbaf42752577249ecdc22c161fc (patch) | |
tree | 9291f0eb1b6c0a57ffeaa7279d4316ab6041206d /lib/default.php | |
parent | 94190e77f664c06c76e650fdebd23720fe26bf6e (diff) | |
parent | b50f300566143837aba3739d62caf679ec19727e (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index fa4ece10a..ab5f294de 100644 --- a/lib/default.php +++ b/lib/default.php @@ -188,7 +188,8 @@ $default = 'cache' => array('base' => null), 'ping' => - array('notify' => array()), + array('notify' => array(), + 'timeout' => 2), 'inboxes' => array('enabled' => true), # ignored after 0.9.x 'newuser' => |