aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorSebastian Egbers <sebastian@egbers.info>2012-06-26 08:33:41 +0200
committerSebastian Egbers <sebastian@egbers.info>2012-06-26 08:33:41 +0200
commit0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381 (patch)
tree8f38f64f6239f1c132b0e2118a4a9b42ba801752 /boot.php
parent8c251aebc77a6daacfe20598fc861df4c243a726 (diff)
parenta4b407eb54c67a0c9b8137b44fbd20b43eccb224 (diff)
downloadvolse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.tar.gz
volse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.tar.bz2
volse-hubzilla-0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381.zip
Merge branch 'master' of https://github.com/friendica/friendica
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 2c8723d26..47e5b8600 100644
--- a/boot.php
+++ b/boot.php
@@ -10,9 +10,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.0.1384' );
+define ( 'FRIENDICA_VERSION', '3.0.1385' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1150 );
+define ( 'DB_UPDATE_VERSION', 1151 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );