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

* remotes/upstream/master:
  update globaldir when page-type changes, add spam date field
  clicking contact on contacts page broken link

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 9045a9442..c3e5c0de0 100755
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1265' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1128      );
+define ( 'DB_UPDATE_VERSION',      1129      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );