aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-15 08:45:19 +0200
committerzottel <github@zottel.net>2012-05-15 08:45:19 +0200
commite9aeafbe13fc8b6371914ecbff67a19769b84bb5 (patch)
tree76fd29eee316460476479ce84c5b36c4b070750f /boot.php
parent584b15aaecbf6f58cda2031908f0319c6dfc0700 (diff)
parent0faa0c2ab189d4a3fd15e843077c2715335eebde (diff)
downloadvolse-hubzilla-e9aeafbe13fc8b6371914ecbff67a19769b84bb5.tar.gz
volse-hubzilla-e9aeafbe13fc8b6371914ecbff67a19769b84bb5.tar.bz2
volse-hubzilla-e9aeafbe13fc8b6371914ecbff67a19769b84bb5.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 f4247483f..281f1b320 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.1341' );
+define ( 'FRIENDICA_VERSION', '3.0.1342' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 );