aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-04 20:25:11 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-04 20:25:11 +0200
commit6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1 (patch)
treed70c693ed6641a841f74211baf326abd86ed131a /phpBB/includes
parent5b6bce89c9866142bb489b6bd6bbf6362c4b9a7a (diff)
parenta469974c85fa04b3f0bc85bd99701920e83b016e (diff)
downloadforums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar
forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.gz
forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.bz2
forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.tar.xz
forums-6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1.zip
Merge branch 'prep-release-3.1.0-b3' into develop-ascraeus
* prep-release-3.1.0-b3: [prep-release-3.1.0-b3] Update phpBB Version for b4 development [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3 [prep-release-3.1.0-b3] Prepare Changelog [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 [prep-release-3.1.0-b3] Update version to 3.1.0-b3
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 66d2e4bd81..77cb499533 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-b3-dev');
+define('PHPBB_VERSION', '3.1.0-b4-dev');
// QA-related
// define('PHPBB_QA', 1);