aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-02 04:58:37 +0100
committertommy tomson <thomas.bierey@gmx.de>2012-03-02 04:58:37 +0100
commit1fac47a2470c392adc2f5a2201f618a804be5136 (patch)
tree0fc2c1a194989fab1948a2dff7f0e46af6facaa3 /boot.php
parent5183e737d0cb53aa9f380051ca130d010893009f (diff)
parent8207272fbc9cdc76988a2848552528e28951fe27 (diff)
downloadvolse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.tar.gz
volse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.tar.bz2
volse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.zip
Merge remote-tracking 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 aee236de3..d3da853fa 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.1267' );
+define ( 'FRIENDICA_VERSION', '2.3.1268' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1130 );