Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber
2010-08-16 16:56:27 -07:00
16 changed files with 728 additions and 123 deletions

View File

@@ -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.4beta2');
define('STATUSNET_VERSION', '0.9.4');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Orange Crush');