aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-20 13:42:33 +0200
committerzottel <github@zottel.net>2012-04-20 13:42:33 +0200
commit9663299da1be50eef4327778fae619fc6f9edef4 (patch)
tree5cd9b93f16c344cf896ac8d4e2a4a818fe21e783 /boot.php
parent041f74dc775424f686a1cd95c00e0d63bfc4b99c (diff)
parent0e25376e4afea4e5d96c233594feef0a35ca314c (diff)
downloadvolse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.gz
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.bz2
volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.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 36e725c7f..73f2aa882 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', '2.3.1313' );
+define ( 'FRIENDICA_VERSION', '2.3.1314' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );