aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-06 08:28:21 +0100
committertommy tomson <thomas.bierey@gmx.de>2012-03-06 08:28:21 +0100
commiteaaf030c182bd6f9c829a26bdc76c33a83d8c098 (patch)
tree14d3ddc70daf4bfe85ba116cfebb82a562c83158 /boot.php
parentb64b1d13a43659af3f479bf29b6ac9b9b3f009ee (diff)
parent321b6516352d25fa64a987fb2efeb0502a24623e (diff)
downloadvolse-hubzilla-eaaf030c182bd6f9c829a26bdc76c33a83d8c098.tar.gz
volse-hubzilla-eaaf030c182bd6f9c829a26bdc76c33a83d8c098.tar.bz2
volse-hubzilla-eaaf030c182bd6f9c829a26bdc76c33a83d8c098.zip
Merge remote-tracking branch 'origin/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 362b49e9f..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.1271' );
+define ( 'FRIENDICA_VERSION', '2.3.1272' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );