aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-11 17:23:53 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-11 17:23:53 +0200
commit0d6fe203729cdade106e21383c3faa5f71b378ce (patch)
treef214fa7a86aeedf0dd8ecaab4b4e9a35ca5425ee /phpBB/includes
parentdd78b564e56152be559b4ec476e35698fa32e1bf (diff)
parentb5492a07da70be20ce64f9f9c080f58089b5ca9a (diff)
downloadforums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar
forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.gz
forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.bz2
forums-0d6fe203729cdade106e21383c3faa5f71b378ce.tar.xz
forums-0d6fe203729cdade106e21383c3faa5f71b378ce.zip
Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeus
* prep-release-3.1.0-RC2: [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2 [prep-release-3.1.0-RC2] Prepare Changelog [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
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 2287639aee..cd4e19bf1d 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-RC2-dev');
+define('PHPBB_VERSION', '3.1.0-RC3-dev');
// QA-related
// define('PHPBB_QA', 1);