aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-06-01 08:31:38 +0200
committerzottel <github@zottel.net>2012-06-01 08:31:38 +0200
commit08b335cac0a881b8f19793aaaebc6dacef445643 (patch)
tree46b41c1f463ab90588f109105c95e85dad8fd432 /boot.php
parent20fdbda25e7fa1c1f6e234867df495be1085f3f8 (diff)
parent93bc29a711637c84a4ffc380078277de89af4e6d (diff)
downloadvolse-hubzilla-08b335cac0a881b8f19793aaaebc6dacef445643.tar.gz
volse-hubzilla-08b335cac0a881b8f19793aaaebc6dacef445643.tar.bz2
volse-hubzilla-08b335cac0a881b8f19793aaaebc6dacef445643.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index fc5b9b2a6..76cf5cbbe 100644
--- 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', '3.0.1359' );
+define ( 'FRIENDICA_VERSION', '3.0.1360' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1145 );