diff options
author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 10:48:43 +0100 |
commit | 3ae016954212e90032a10d1427c34a4ff9d9637c (patch) | |
tree | 984936f6d9c93958cac2dd4b83103eaf4cdf0907 /phpBB/includes | |
parent | 2a939fa779059b2eedc5eaf33706b4a1627ed30e (diff) | |
parent | 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb (diff) | |
download | forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.gz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.bz2 forums-3ae016954212e90032a10d1427c34a4ff9d9637c.tar.xz forums-3ae016954212e90032a10d1427c34a4ff9d9637c.zip |
Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/constants.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7eeb36595d..8a5d49358c 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.2.3-dev'); +@define('PHPBB_VERSION', '3.2.2'); // QA-related // define('PHPBB_QA', 1); |