aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-27 08:10:04 +0200
committerzottel <github@zottel.net>2012-04-27 08:10:04 +0200
commit17aba3033ff050a031ae578f0351db3da29ecbb7 (patch)
treeee1e97a2374a104ad966507a315a8947b5adb715 /boot.php
parent0116426a0eccc81382a670989032b0a095a65a20 (diff)
parenta1f94ac59f677c61e97facb2835883191a9e48af (diff)
downloadvolse-hubzilla-17aba3033ff050a031ae578f0351db3da29ecbb7.tar.gz
volse-hubzilla-17aba3033ff050a031ae578f0351db3da29ecbb7.tar.bz2
volse-hubzilla-17aba3033ff050a031ae578f0351db3da29ecbb7.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 8b25dff46..b8a61c796 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.1322' );
+define ( 'FRIENDICA_VERSION', '2.3.1324' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );