From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 1 Jun 2018 11:30:04 +0000 (-0400)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93daf7883e98d797759fb81dbf12e9e368debf61;p=friendica.git

Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
---

93daf7883e98d797759fb81dbf12e9e368debf61
diff --cc VERSION
index 52b0d2a456,41df8e6ae6..607ef5eb6a
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 2018-05-dev
 -2018.05
++2018.08-dev
diff --cc boot.php
index 9963878c22,8f077b440d..57176296e4
--- a/boot.php
+++ b/boot.php
@@@ -39,9 -39,9 +39,9 @@@ require_once 'include/text.php'
  
  define('FRIENDICA_PLATFORM',     'Friendica');
  define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
- define('FRIENDICA_VERSION',      '2018-05-dev');
 -define('FRIENDICA_VERSION',      '2018.05');
++define('FRIENDICA_VERSION',      '2018.08-dev');
  define('DFRN_PROTOCOL_VERSION',  '2.23');
- define('DB_UPDATE_VERSION',      1260);
 -define('DB_UPDATE_VERSION',      1266);
++define('DB_UPDATE_VERSION',      1267);
  define('NEW_UPDATE_ROUTINE_VERSION', 1170);
  
  /**
diff --cc database.sql
index cb47410e9c,ce5befc863..cc6ab16e1d
--- a/database.sql
+++ b/database.sql
@@@ -1,6 -1,6 +1,6 @@@
  -- ------------------------------------------
- -- Friendica 2018-05-dev (The Tazmans Flax-lily)
- -- DB_UPDATE_VERSION 1260
 --- Friendica 2018.05 (The Tazmans Flax-lily)
 --- DB_UPDATE_VERSION 1266
++-- Friendica 2018.08-dev (The Tazmans Flax-lily)
++-- DB_UPDATE_VERSION 1267
  -- ------------------------------------------