aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-08-23 18:22:33 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-08-23 18:22:33 +0200
commit4be255ef9f79930f2cfdc5aaae75a24b794750a2 (patch)
tree928f6ba32f8960b70b90ab37e1a26286b11ea004 /phpBB/includes
parenta7272fec9767ff6ce0b9f560c57afb0965d17c25 (diff)
parent5be06ec66ac16def5d2ab53df4a0420d60624675 (diff)
downloadforums-4be255ef9f79930f2cfdc5aaae75a24b794750a2.tar
forums-4be255ef9f79930f2cfdc5aaae75a24b794750a2.tar.gz
forums-4be255ef9f79930f2cfdc5aaae75a24b794750a2.tar.bz2
forums-4be255ef9f79930f2cfdc5aaae75a24b794750a2.tar.xz
forums-4be255ef9f79930f2cfdc5aaae75a24b794750a2.zip
Merge branch 'prep-release-3.1.6' into 3.1.x
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 62e5fe7a0a..3022137150 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.6-dev');
+define('PHPBB_VERSION', '3.1.6-RC1');
// QA-related
// define('PHPBB_QA', 1);