aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-06 09:48:08 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-06 09:48:08 +0100
commitbe9985a3aed1bfbbc6964973e2f12d0bd7928c04 (patch)
tree4fc044f6200f010778363a8de72671f45c259eaa /boot.php
parent8a51e29824fc2569ac1d0def3070bee7c0552231 (diff)
parentd04fba704861fa27184346d0cefe2069ec8cfa6d (diff)
downloadvolse-hubzilla-be9985a3aed1bfbbc6964973e2f12d0bd7928c04.tar.gz
volse-hubzilla-be9985a3aed1bfbbc6964973e2f12d0bd7928c04.tar.bz2
volse-hubzilla-be9985a3aed1bfbbc6964973e2f12d0bd7928c04.zip
Merge remote-tracking branch 'friendica/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..429bfecb3 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.1272' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );