aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-12 10:56:20 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-12 10:56:20 +0200
commit7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6 (patch)
tree2b5dde754d2872a4cab04d8af044dfbfaac48dad
parent483b40dfa3b67471b1e9b912233d8a0c3c11f23c (diff)
downloadforums-7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6.tar
forums-7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6.tar.gz
forums-7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6.tar.bz2
forums-7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6.tar.xz
forums-7faf66c492c038dcbd3dd09d8064ff0b15bb0ee6.zip
[ticket/12974] Update nightly build version to 3.2.0-a1-dev
PHPBB3-12974
-rw-r--r--build/build.xml2
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/styles/prosilver/style.cfg4
4 files changed, 5 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml
index 991d344331..8e968a908f 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.1.0-RC4-dev" />
+ <property name="newversion" value="3.2.0-a1-dev" />
<property name="prevversion" value="3.1.0-RC3" />
<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2" />
<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 0eac2e9417..126cf44842 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.1.0-RC4-dev');
+define('PHPBB_VERSION', '3.2.0-a1-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 37e1c8de50..c32e2f825a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,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.1.0-RC4-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a1-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');
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index aea59021d6..481b80d912 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Limited, 2007
-style_version = 3.1.0-RC3
-phpbb_version = 3.1.0-RC3
+style_version = 3.2.0-a1-dev
+phpbb_version = 3.2.0-a1-dev
# Defining a different template bitfield
# template_bitfield = lNg=