aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-12-19 18:04:04 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-12-19 18:04:04 +0100
commit2a3f94e4521f00142b99ba4fa5f4ec093159cbb7 (patch)
tree35dc0c015976fbba09d48b48c6dd1850be3bff53 /boot.php
parentc3d12bc77ea3af6adc72f078d06bb9b199af6b45 (diff)
parent177af1fc9d286c4ecc7e5ce43e17f492b9e11817 (diff)
downloadvolse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.tar.gz
volse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.tar.bz2
volse-hubzilla-2a3f94e4521f00142b99ba4fa5f4ec093159cbb7.zip
Merge remote-tracking branch 'friendica/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 c604e4f77..5cc77182a 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.1194' );
+define ( 'FRIENDICA_VERSION', '2.3.1199' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
-define ( 'DB_UPDATE_VERSION', 1111 );
+define ( 'DB_UPDATE_VERSION', 1112 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );