1
0
Fork 0

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-12-17 10:32:53 +01:00
commit a6b1275f16
26 changed files with 8019 additions and 4840 deletions

View file

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1545' );
define ( 'FRIENDICA_VERSION', '3.1.1559' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 );