aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/constants.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-07 22:11:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-07 22:11:14 +0200
commit5b186c936d6d6d67b8b0551a990522fdc68e2a4c (patch)
treeaf8267503ec08016417f2f6708cdd0aa93575e95 /phpBB/includes/constants.php
parent63bdd193e0da90dc12ff2b6523b255f832420d3b (diff)
parenteed4d0d30f6732474d01c787c30cf7f80b584b07 (diff)
downloadforums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar
forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.gz
forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.bz2
forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.tar.xz
forums-5b186c936d6d6d67b8b0551a990522fdc68e2a4c.zip
Merge branch 'prep-release-3.1.0-RC5' into develop-ascraeus
Diffstat (limited to 'phpBB/includes/constants.php')
-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 b72e4ab6d4..6693b822fe 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-RC5-dev');
+define('PHPBB_VERSION', '3.1.0-RC6-dev');
// QA-related
// define('PHPBB_QA', 1);