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

* remotes/upstream/master:
  bbcode toolbar attached to the comment text field minor css-fixes
  diabook-themes: small icon fix
  diabook-nav-icons with gradient
  use local_user for tag completion if available. See bug #368
  more sane defaults datetime_convert
  fix empty string timezone
  Some new German translations
  send zrl after dfrn_request homecoming for manual entries
  fix to wall_upload photos default permissions to use cid rather than uid.
  fixed z-index of youtube-vids  fixed bug to hide right_side

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index b1c378d34..1815d37e2 100644
--- 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.1305' );
+define ( 'FRIENDICA_VERSION',      '2.3.1306' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1137      );