Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	view/de/strings.php

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 76d2f9326..b30f02c9f 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.1275' );
+define ( 'FRIENDICA_VERSION',      '2.3.1278' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );