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 | |
| 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
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml index d7fc84acf5..7a244e48d9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.3.0-a1-dev" /> - <property name="prevversion" value="3.2.0-b1" /> - <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.2.0-a1, 3.2.0-a2" /> + <property name="newversion" value="3.2.0-b3-dev" /> + <property name="prevversion" value="3.2.0-b2" /> + <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> 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'); |