diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 17:19:35 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 17:19:35 +0100 |
commit | 385feb0a5d21676786884aab0956976505efdf2a (patch) | |
tree | c47b7193be0ea4b6474bc46c5024076195bd6d39 | |
parent | 9e1ef9fad3b0e02ed753100943293a6ea79f67dd (diff) | |
download | forums-385feb0a5d21676786884aab0956976505efdf2a.tar forums-385feb0a5d21676786884aab0956976505efdf2a.tar.gz forums-385feb0a5d21676786884aab0956976505efdf2a.tar.bz2 forums-385feb0a5d21676786884aab0956976505efdf2a.tar.xz forums-385feb0a5d21676786884aab0956976505efdf2a.zip |
[3.2.x] Update development version to 3.2.1-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 165f522047..dd5fa4c5d8 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" /> - <property name="prevversion" value="3.2.0-RC2" /> - <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.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1" /> + <property name="newversion" value="3.2.1-dev" /> + <property name="prevversion" value="3.2.0" /> + <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.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2" /> <!-- 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 523f7adc53..440064140c 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'); +@define('PHPBB_VERSION', '3.2.1-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5a9e012701..998cf17c3d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,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'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.1-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'); |