Merge branch 'pull'

diff --git a/boot.php b/boot.php
index b3c79079a6f373f249546fe91be529c0c511c3d6..d5feaed2d148402c53abd5853d5efa5acf2cb2fb 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1284' );
+define ( 'FRIENDICA_VERSION',      '2.3.1285' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1132      );