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

* remotes/upstream/master:
  fix text-editor in theme
  german strings as of 28th Feb from transilex
  small fix in style.css
  fix star/unstar
  fixes in wall_item.tpl and style.css in theme diabook
  fix in wall_item.tpl new icon link.png
  add diabook to default themes
  fixed broken tags and notifications in theme

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 19728b6ba..b464d2525 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.1268' );
+define ( 'FRIENDICA_VERSION',      '2.3.1269' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );