aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-19 14:04:24 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-19 14:04:24 +0200
commit9a940786c18c1c2bd772aec93f1828f67dc45667 (patch)
tree54114a005e74c8a6d8bad8a490e1d1e41bc4178f /boot.php
parentf2c0c40f6e488f1a8e62bda9449b28115f343cac (diff)
parent513ef2410d9b892c8ebcb7ceac96b97023c3b5a5 (diff)
downloadvolse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.gz
volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.bz2
volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.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 f9bfa7551..7174b6822 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.1343' );
+define ( 'FRIENDICA_VERSION', '3.0.1346' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1143 );
+define ( 'DB_UPDATE_VERSION', 1144 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );