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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	mod/admin.php
	mod/settings.php
This commit is contained in:
Michael Vogel
2013-12-02 00:33:46 +01:00
parent 6684107b66 acd29f22a0
commit e0cf2c5167
26 changed files with 29884 additions and 28549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.2.1744' );
define ( 'FRIENDICA_VERSION', '3.2.1745' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1165 );
define ( 'DB_UPDATE_VERSION', 1166 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );