aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-04-10 09:53:58 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-04-10 09:53:58 +0200
commitfcc7e7d33306347128158ff843db08bd25039cb4 (patch)
treee1aabf1762cee2673645e1252c4fd48d6dcce6ae /phpBB/includes
parent17620bba46138ec48a6748a4147986b1d21a48fd (diff)
parent073f3e4470016af718f90070276305615abc007f (diff)
downloadforums-fcc7e7d33306347128158ff843db08bd25039cb4.tar
forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.gz
forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.bz2
forums-fcc7e7d33306347128158ff843db08bd25039cb4.tar.xz
forums-fcc7e7d33306347128158ff843db08bd25039cb4.zip
Merge branch 'prep-release-3.1.4' 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 321a87b4b0..2fa489ff2d 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.4-dev');
+define('PHPBB_VERSION', '3.1.4-RC1');
// QA-related
// define('PHPBB_QA', 1);