Merge remote branch 'upstream/master'

Conflicts:
	include/bbcode.php

1 files changed, 2 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index d9c788f8a..8b78c0ee5 100755
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1255' );
+define ( 'FRIENDICA_VERSION',      '2.3.1260' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1122      );
+define ( 'DB_UPDATE_VERSION',      1123      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );