bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Browse source 
Conflicts:
	include/onepoll.php
This commit is contained in:
Michael 2017-03-12 20:54:28 +00:00
commit 1624150db4
27 changed files with 13447 additions and 13110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -38,9 +38,9 @@ require_once('include/dbstructure.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.1-rc' );
define ( 'FRIENDICA_VERSION', '3.5.2-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1214 );
define ( 'DB_UPDATE_VERSION', 1215 );
/**
* @brief Constant with a HTML line break.