Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Conflicts:
	update.php
This commit is contained in:
Domovoy
2012-08-03 18:57:37 +02:00
51 changed files with 486 additions and 3833 deletions

View File

@@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1419' );
define ( 'FRIENDICA_VERSION', '3.0.1423' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 );