aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorAndrew Manning <andrew@reticu.li>2016-11-30 21:22:51 -0500
committerAndrew Manning <andrew@reticu.li>2016-11-30 21:22:51 -0500
commit3f838e1dbccab819ce0cf93b079afea8d41d2a7a (patch)
treef76eb1fbb01cb3917474613c0f0bcfbe74ba0aa3 /boot.php
parent50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (diff)
parentc845eed114ec3cea90acd35c419110d9ab76051f (diff)
downloadvolse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.gz
volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.bz2
volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.zip
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 9b5b54e6a..fdbe1325e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/zid.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.15.2' );
-define ( 'ZOT_REVISION', '1.1' );
+define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1185 );