aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-12-01 19:20:55 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-12-01 19:20:55 +0100
commit73fd2f357323bc3690ce15be23a54ef1896f87fa (patch)
tree6725357510b6d64ee0cfe31dc799782037c15d9e
parent0a14d7aff3328d8fb060fcde72aad6e99e33487e (diff)
downloadforums-73fd2f357323bc3690ce15be23a54ef1896f87fa.tar
forums-73fd2f357323bc3690ce15be23a54ef1896f87fa.tar.gz
forums-73fd2f357323bc3690ce15be23a54ef1896f87fa.tar.bz2
forums-73fd2f357323bc3690ce15be23a54ef1896f87fa.tar.xz
forums-73fd2f357323bc3690ce15be23a54ef1896f87fa.zip
[3.2.x] Update versions to 3.2.6-dev
-rw-r--r--build/build.xml2
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
3 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml
index d740bb6efe..d746cba18d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.2.5-RC1" />
+ <property name="newversion" value="3.2.6-dev" />
<property name="prevversion" value="3.2.4" />
<property name="olderversions" value="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.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1, 3.2.2, 3.2.3" />
<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 0c6595945c..d80f348ac5 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.5-RC1');
+@define('PHPBB_VERSION', '3.2.6-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index c6fa38919b..2a032bb991 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -279,7 +279,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.5-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.6-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');