aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-07 09:11:45 +0200
committerzottel <github@zottel.net>2012-05-07 09:11:45 +0200
commita2ea560bf397902ce5608daabf101d0bcf813f13 (patch)
tree0f4020d6b86c65cc317739b8e562ea50801ec277 /boot.php
parent3cd428152d8727b838565c462f91accd35204ce1 (diff)
parentc7f3e626d0bb141be86a8af6ffbe40768bc23069 (diff)
downloadvolse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.tar.gz
volse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.tar.bz2
volse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 03d5b0b2c..1c656b3da 100644
--- 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.1331' );
+define ( 'FRIENDICA_VERSION', '2.3.1334' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 );