aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-30 17:53:16 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-30 17:53:16 +0200
commita84bb5f6a137577ea92a460520ecd4a6c3895a72 (patch)
treea220e258892308a97b447c1355d695fa56f86282 /phpBB/includes
parent300d68ff53ee6ef9c9f09f29c6770c1bc117ea77 (diff)
parent807e000b912a30f3c8010dd7c2acdfa04f6c5392 (diff)
downloadforums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar
forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.gz
forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.bz2
forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.tar.xz
forums-a84bb5f6a137577ea92a460520ecd4a6c3895a72.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [prep-release-3.1.0-b4] Update phpBB Version for b5 development [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4 [prep-release-3.1.0-b4] Prepare Changelog [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 [prep-release-3.1.0-b4] Update version to 3.1.0-b4
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 602067a0e7..cf18cafe90 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-b4-dev');
+define('PHPBB_VERSION', '3.1.0-b5-dev');
// QA-related
// define('PHPBB_QA', 1);