aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-06-03 14:21:51 +0200
committerzottel <github@zottel.net>2012-06-03 14:21:51 +0200
commit70c4ab68754941749a5e89434d6db19f6bba1e16 (patch)
tree525a6536b6ab7f9020e83daf9287c785303ad584 /boot.php
parentdf2fdf08ddf8cb354022992d4353ced4295b77b3 (diff)
parentdaa4f5213f726b22846859f2f12d06889e9bdc9b (diff)
downloadvolse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.gz
volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.bz2
volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.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 2e83d371f..559cd8c32 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', '3.0.1361' );
+define ( 'FRIENDICA_VERSION', '3.0.1362' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1145 );
+define ( 'DB_UPDATE_VERSION', 1147 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );