diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-12 10:17:47 +0200 |
| commit | 483b40dfa3b67471b1e9b912233d8a0c3c11f23c (patch) | |
| tree | a5e335a6d0c0ad446b30def9f334d49d5f57fdd5 /phpBB/includes/constants.php | |
| parent | a60d4b250798bfd8e974746dcb3d6b5a81f063ed (diff) | |
| parent | e47b7540c3def5635bd33614122c70f13588580c (diff) | |
| download | forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.gz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.bz2 forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.tar.xz forums-483b40dfa3b67471b1e9b912233d8a0c3c11f23c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
[prep-release-3.1.0-RC3] Prepare Changelog
[prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
Conflicts:
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/includes/constants.php')
| -rw-r--r-- | phpBB/includes/constants.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index cd4e19bf1d..0eac2e9417 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-RC3-dev'); +define('PHPBB_VERSION', '3.1.0-RC4-dev'); // QA-related // define('PHPBB_QA', 1); |