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

* remotes/upstream/master:
  click anywhere to close notifications -> zeros and bubbles
  revup
  fix css
  use fancybox instead of lightbox
  fixes

* master:

1 files changed, 1 insertions, 1 deletions

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