diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-23 23:20:04 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-23 23:20:04 +0100 |
| commit | 8a3288e3aa9bdbdd6f2648c841d82edc41147cfd (patch) | |
| tree | 6f3293454081439d0a79842e8788edb29da4fbd6 | |
| parent | 3698e9b8e08e47edb79c074f50de2fb40a3fcfcf (diff) | |
| download | forums-8a3288e3aa9bdbdd6f2648c841d82edc41147cfd.tar forums-8a3288e3aa9bdbdd6f2648c841d82edc41147cfd.tar.gz forums-8a3288e3aa9bdbdd6f2648c841d82edc41147cfd.tar.bz2 forums-8a3288e3aa9bdbdd6f2648c841d82edc41147cfd.tar.xz forums-8a3288e3aa9bdbdd6f2648c841d82edc41147cfd.zip | |
[master] Update version to 3.2.0-a2-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 0d551e606b..b85f9b49cb 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.2.0-a1" /> - <property name="prevversion" value="3.1.6" /> - <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" /> + <property name="newversion" value="3.2.0-a2-dev" /> + <property name="prevversion" value="3.2.0-a1" /> + <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" /> <!-- 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 551cf1f432..680d5a2b4e 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.0-a1'); +define('PHPBB_VERSION', '3.2.0-a2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index f1366c9677..5cf5af6ddc 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -275,7 +275,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.2.0-a1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a2-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'); |