Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 81e84d372..362b49e9f 100755
--- 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.1270' );
+define ( 'FRIENDICA_VERSION',      '2.3.1271' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );