aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-21 19:26:24 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-21 19:26:24 +0200
commit71e2dbf3522dcf076458805ee65dc976fb35a6f3 (patch)
tree5c11d463eff15245458f5033d7d425671df8f1d0 /boot.php
parenta147d6113c081694d4209002fa5e57106d4c6f41 (diff)
parentbdbe068b95e8c302179530dff7583997ff35f246 (diff)
downloadvolse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.gz
volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.bz2
volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.zip
Merge commit '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 94202cd5d..bbcc9d9a6 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.1312' );
+define ( 'FRIENDICA_VERSION', '2.3.1318' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );