diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-27 20:49:40 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-27 20:49:40 -0800 |
| commit | 944a89dfeb20465525ee028f15259431cde4e9c4 (patch) | |
| tree | 106719e78f58e756d4653209834d12c0782e7436 /lib | |
| parent | 0794ecf372ffff2e0cc93509ae3462ca0cbbc99c (diff) | |
| parent | 644c319f5ad78dbedb686cdfef38152cadf615b2 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 2 | ||||
| -rw-r--r-- | lib/default.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php index ada48b339..b4e4a653c 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0beta3'); +define('STATUSNET_VERSION', '0.9.0beta4'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); diff --git a/lib/default.php b/lib/default.php index 10ea34864..c729193b5 100644 --- a/lib/default.php +++ b/lib/default.php @@ -87,6 +87,7 @@ $default = 'monitor' => null, // URL to monitor ping endpoint (work in progress) 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully 'debug_memory' => false, // true to spit memory usage to log + 'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue ), 'license' => array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private' |