aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-01 11:47:45 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-01 11:47:45 +0100
commitb6b7742579d16a4eab97249758a62c5ff33bd07d (patch)
treec96868ebedd31c0fe976452a635b044038abc9cc /boot.php
parented42fa7d59f0eb979b3b5c86b6969c53d6b6573b (diff)
parentbd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff)
downloadvolse-hubzilla-b6b7742579d16a4eab97249758a62c5ff33bd07d.tar.gz
volse-hubzilla-b6b7742579d16a4eab97249758a62c5ff33bd07d.tar.bz2
volse-hubzilla-b6b7742579d16a4eab97249758a62c5ff33bd07d.zip
Merge remote-tracking branch 'friendica/master' into randomerror
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index e1dc7e537..aee236de3 100755
--- 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.1266' );
+define ( 'FRIENDICA_VERSION', '2.3.1267' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
-define ( 'DB_UPDATE_VERSION', 1129 );
+define ( 'DB_UPDATE_VERSION', 1130 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );