Merge branch 'pull'

diff --git a/boot.php b/boot.php
index 362b49e9fc8032c0aa1b9f4f84e140359247ed22..429bfecb3dcfbd19ae0cfe71a49c7e97ce351738 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.1271' );
+define ( 'FRIENDICA_VERSION',      '2.3.1272' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );