aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2011-12-06 00:02:29 -0800
committerzottel <github@zottel.net>2011-12-06 00:02:29 -0800
commitcd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa (patch)
tree2efc84f14303c5d8dd283a93b64f02851e969e3f /boot.php
parentc5c99089ff363831f199e27c188410fec682fda5 (diff)
parent47f369e052d296f4a744c1508efc58f6168b7e8b (diff)
downloadvolse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.gz
volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.bz2
volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index d283fa778..875d4a69b 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1185' );
+define ( 'FRIENDICA_VERSION', '2.3.1186' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
-define ( 'DB_UPDATE_VERSION', 1108 );
+define ( 'DB_UPDATE_VERSION', 1109 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );