aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-20 09:53:23 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-20 09:53:23 +0200
commite00545588145e7d4d33cb9780673f36a6049f0eb (patch)
treef714f24b7e681c4a2f61eff8aab3a721b36bde79 /phpBB/includes
parentfc252f1ba52760a072d8e79f5afc3268db7d1035 (diff)
parent26c6ffa458a70fa30d8bf925418ddf05cf86d1de (diff)
downloadforums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar
forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.gz
forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.bz2
forums-e00545588145e7d4d33cb9780673f36a6049f0eb.tar.xz
forums-e00545588145e7d4d33cb9780673f36a6049f0eb.zip
Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeus
* prep-release-3.1.0-RC4: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/constants.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 0eac2e9417..b72e4ab6d4 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-RC4-dev');
+define('PHPBB_VERSION', '3.1.0-RC5-dev');
// QA-related
// define('PHPBB_QA', 1);