aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-04 08:56:35 +0200
committerzottel <github@zottel.net>2012-04-04 08:56:35 +0200
commit64a1367525ac920721943a08adec1124657df70d (patch)
treebf23c495a023915b0d4063adfb6fc04e046a28d8 /boot.php
parente5cd5aab5cf5fd5019ec3178f09f5515c390c9d9 (diff)
parent5c6c9d756fbb816c1473ccb7b6ec72662c749f4f (diff)
downloadvolse-hubzilla-64a1367525ac920721943a08adec1124657df70d.tar.gz
volse-hubzilla-64a1367525ac920721943a08adec1124657df70d.tar.bz2
volse-hubzilla-64a1367525ac920721943a08adec1124657df70d.zip
Merge remote branch 'upstream/master'
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 bcc51a995..f08eda0f1 100755
--- 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', '2.3.1300' );
+define ( 'FRIENDICA_VERSION', '2.3.1301' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );