GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Browse Source 
Conflicts:
	js/util.min.js
	lib/default.php
This commit is contained in:
Shashi Gowda
2011-04-07 23:13:45 +05:30
parent 14aef781ad 5b9319d081
commit ad86eb78d3
102 changed files with 1382 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework.php
View File

@@ -20,7 +20,7 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
define('STATUSNET_BASE_VERSION', '1.0.0');
define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
define('STATUSNET_LIFECYCLE', 'alpha2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility