aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-03-03 13:21:11 +0100
committerMichael <icarus@dabo.de>2012-03-03 13:21:11 +0100
commit81a8d4f9dbd32de133e647c87a5394dd52f009fe (patch)
treef1264d57804d810758163bdddf734f82e7d1091f /boot.php
parentccfe402fb0b92dc8e62dc87137743851441e27f6 (diff)
parent9d885c4801e74205dc958aaf4a17f44c4d9134d6 (diff)
downloadvolse-hubzilla-81a8d4f9dbd32de133e647c87a5394dd52f009fe.tar.gz
volse-hubzilla-81a8d4f9dbd32de133e647c87a5394dd52f009fe.tar.bz2
volse-hubzilla-81a8d4f9dbd32de133e647c87a5394dd52f009fe.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 19728b6ba..b464d2525 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.1268' );
+define ( 'FRIENDICA_VERSION', '2.3.1269' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );