diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
| commit | 4419e43f7f62d92f01ba8f844aa9cd472051dd84 (patch) | |
| tree | 4c80501a0306c1cddd2427685824bef62683020b /lib/common.php | |
| parent | 6f95ccd37de1f7e2063206e87c93cbe06097eae7 (diff) | |
| parent | f2fd8b36f4a932f50770c84d769297bcfc1c1483 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.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 422a639b8..0a0f5c631 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.4'); +define('STATUSNET_VERSION', '0.9.5'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility -define('STATUSNET_CODENAME', 'Orange Crush'); +define('STATUSNET_CODENAME', 'What\'s The Frequency, Kenneth?'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); |