clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/conversation.php
This commit is contained in:
Domovoy
2012-08-05 13:43:53 +02:00
parent 5d1eb37b9b f616fd21e7
commit e247915f48
21 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
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.1424' );
define ( 'FRIENDICA_VERSION', '3.0.1425' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 );
@@ -349,6 +349,7 @@ if(! class_exists('App')) {
public $plugins;
public $apps = array();
public $identities;
public $sourcename = '';
public $nav_sel;