Merge branch 'master' into dev

2016-06-20 21:46:33 +02:00
parent cc09f9a7a5 17c5502330
commit 985fb44424
40 changed files with 74853 additions and 100092 deletions
--- a/boot.php
+++ b/boot.php
@@ -45,8 +45,8 @@ require_once('include/account.php');


 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '1.9' );
-define ( 'ZOT_REVISION',            1.1     );
+define ( 'STD_VERSION',             '1.8' );
+define ( 'ZOT_REVISION',            '1.1' );

 define ( 'DB_UPDATE_VERSION',       1178  );