Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/util.php
This commit is contained in:
Brion Vibber
2010-04-30 13:15:53 -07:00
79 changed files with 6511 additions and 3801 deletions

View File

@@ -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.1');
define('STATUSNET_VERSION', '0.9.2');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Everybody Hurts');
define('STATUSNET_CODENAME', 'King of Birds');
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);