1
1
Fork 0

Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	update.php
This commit is contained in:
Michael Vogel 2014-09-04 02:29:12 +02:00
commit 24b3befc4d
4 changed files with 31 additions and 5 deletions

View file

@ -14,7 +14,7 @@ require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.2.1753' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1171 );
define ( 'DB_UPDATE_VERSION', 1173 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );