aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-03-30 23:01:27 +0200
commita618710a69cf797d2b64a3567b2d2da327cddc25 (patch)
tree566b60106dea46146039a27e908fa7aceed62401 /phpBB/includes
parentacb4d90371cfa2682e74e38c8e3bef087ace7600 (diff)
parent45f2efea19280092da2d58f506c56aee4a998a9d (diff)
downloadforums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.gz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.bz2
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.tar.xz
forums-a618710a69cf797d2b64a3567b2d2da327cddc25.zip
Merge branch 'prep-release-3.1.0-b2' into develop-ascraeus
* prep-release-3.1.0-b2: [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 [prep-release-3.1.0-b2] Prepare Changelog [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 [prep-release-3.1.0-b2] Update version to 3.1.0-b2
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 fe23ed5a9a..11bbcd4154 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-b2-dev');
+define('PHPBB_VERSION', '3.1.0-b3-dev');
// QA-related
// define('PHPBB_QA', 1);