Merge branch 'develop' into 1706-lock

This commit is contained in:
Michael Vogel 2017-06-06 14:16:00 +02:00 committed by GitHub
commit f4652d6e50
31 changed files with 19040 additions and 7890 deletions

View file

@ -39,7 +39,7 @@ require_once 'include/poller.php';
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.2-rc' );
define ( 'FRIENDICA_VERSION', '3.5.3dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1228 );