aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-25 00:07:18 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-25 00:07:18 +0200
commit3e9d62b9b08691f38f53eb79cdac3698a108a46b (patch)
tree8316d8989f94823114811074a01ccb25c437898a /phpBB/includes
parent70a98e6f633761e695aaa5240d86c038c6f8f233 (diff)
parent19b4391eefb742b3682195231f732240adca48f1 (diff)
downloadforums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.gz
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.bz2
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.tar.xz
forums-3e9d62b9b08691f38f53eb79cdac3698a108a46b.zip
Merge branch 'prep-release-3.1.0-RC1' into develop-ascraeus
* prep-release-3.1.0-RC1: [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1 [prep-release-3.1.0-RC1] Prepare Changelog [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
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 723956de0c..2287639aee 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-b5-dev');
+define('PHPBB_VERSION', '3.1.0-RC2-dev');
// QA-related
// define('PHPBB_QA', 1);