aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-10-15 22:46:02 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-10-15 22:46:02 +0200
commit3bb93ab2d34251a51b67c722db3b40500749fa17 (patch)
treeed2814c71712a5a1df00029bebf53be0f091c240
parent437d38bc05390c2eb1323aa2e43f3f1c8df81391 (diff)
downloadforums-3bb93ab2d34251a51b67c722db3b40500749fa17.tar
forums-3bb93ab2d34251a51b67c722db3b40500749fa17.tar.gz
forums-3bb93ab2d34251a51b67c722db3b40500749fa17.tar.bz2
forums-3bb93ab2d34251a51b67c722db3b40500749fa17.tar.xz
forums-3bb93ab2d34251a51b67c722db3b40500749fa17.zip
[develop] Update version to 3.1.0-a2-dev
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 5165463969..e1da41d106 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-a1');
+define('PHPBB_VERSION', '3.1.0-a2-dev');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index c861028b47..03ed15c0ec 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3',
- 'phpbb_version' => '3.1.0-a1',
+ 'phpbb_version' => '3.1.0-a2-dev',
'author' => '<a href="https://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms,
'dbhost' => $dbhost,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0aa84a7610..794def40dc 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -270,7 +270,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-a1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.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');