diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-07 17:38:34 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-07 17:38:34 +0100 |
| commit | e6e87ab214a1b6829bf64729ddb9718f6784ce45 (patch) | |
| tree | b98644960da2b404280fa4a36256d74fc2c062bb /phpBB | |
| parent | a1b7a5aedc247190f00dc03e490f5846be32f3e6 (diff) | |
| parent | 9d7b6260bd1ef0a0a07af7ec5cd2c1955f31a74c (diff) | |
| download | forums-e6e87ab214a1b6829bf64729ddb9718f6784ce45.tar forums-e6e87ab214a1b6829bf64729ddb9718f6784ce45.tar.gz forums-e6e87ab214a1b6829bf64729ddb9718f6784ce45.tar.bz2 forums-e6e87ab214a1b6829bf64729ddb9718f6784ce45.tar.xz forums-e6e87ab214a1b6829bf64729ddb9718f6784ce45.zip | |
Merge branch '3.2.x'
* 3.2.x:
[release-3.2.0-b2] Update versions to 3.2.0-3-dev
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index db29be617f..3a186fd892 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.3.0-a1-dev'); +@define('PHPBB_VERSION', '3.2.0-b3-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 1ea987c577..9791174e0f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -276,7 +276,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-a1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-b3-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |