Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 06:30:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Browse source 
Conflicts:
	include/onepoll.php
	include/queue.php
This commit is contained in:
Michael 2017-03-12 21:03:44 +00:00
commit 77e8c44016
26 changed files with 13391 additions and 13065 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -37,9 +37,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.