aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-23 08:57:49 +0200
committerzottel <github@zottel.net>2012-04-23 08:57:49 +0200
commite6847cdd3f6faf087dc7e738e1dbae7d70113451 (patch)
tree3746742dc12c2863c61c4c7cba8f4f9666590e49 /boot.php
parent9663299da1be50eef4327778fae619fc6f9edef4 (diff)
parent2170df897b9dc72b87cc104520f6a67ddfbb994f (diff)
downloadvolse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.gz
volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.tar.bz2
volse-hubzilla-e6847cdd3f6faf087dc7e738e1dbae7d70113451.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 73f2aa882..1dd52fe7f 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.1314' );
+define ( 'FRIENDICA_VERSION', '2.3.1320' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );