aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-24 10:38:23 +0200
committerzottel <github@zottel.net>2012-04-24 10:38:23 +0200
commit912e008ded3d439f7779310eb422e4b871a9b63d (patch)
tree61f1960c1ff17e27d0755e40ea7ccb90d0c0d4b1 /boot.php
parente6847cdd3f6faf087dc7e738e1dbae7d70113451 (diff)
parentfbdb8fc43a3cb03f25102f15a1deaf8408e9122a (diff)
downloadvolse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.gz
volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.bz2
volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.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 1dd52fe7f..d2758c643 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.1320' );
+define ( 'FRIENDICA_VERSION', '2.3.1321' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );