aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-02-27 00:03:51 +0100
committerMichael <icarus@dabo.de>2012-02-27 00:03:51 +0100
commit18679111f5aed8f1c5e7ccb9857195e52c57765d (patch)
treebffb4a563ed2fe1ff02a4221e28c608460c866db /boot.php
parentfe3dfbee5638dd2988bd8b126652b3138572f02c (diff)
parent6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff)
downloadvolse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.gz
volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.bz2
volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.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 e9f9efd70..ada0f563d 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.1263' );
+define ( 'FRIENDICA_VERSION', '2.3.1264' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1127 );