diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
commit | 873b8328272ae9cb189477fd10e75b16d5ce050e (patch) | |
tree | 89979da777a4d2158321f56a69409882d6e96321 /lib/common.php | |
parent | a8d92dad5e4b82dd5a4f0ca7ed52f37256b60cd2 (diff) | |
parent | bf468e2a8db4d67a0f1a2c7fdfd0aa9306e006fc (diff) |
Merge branch 'master' into testing
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
Diffstat (limited to 'lib/common.php')
-rw-r--r-- | lib/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common.php b/lib/common.php index 334a88ffd..8d2e6b420 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,10 +22,10 @@ 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.0'); +define('STATUSNET_VERSION', '0.9.1'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility -define('STATUSNET_CODENAME', 'Stand'); +define('STATUSNET_CODENAME', 'Everybody Hurts'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); |