diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
| commit | 3521dfc2787a532365dba12eec669579d15d79f2 (patch) | |
| tree | 9e606800cdde4e3051ed8eae0685afdc4b8c1929 /phpBB/install | |
| parent | 40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff) | |
| parent | a35721f68c95153f46dd67ea465addedf82f538e (diff) | |
| download | forums-3521dfc2787a532365dba12eec669579d15d79f2.tar forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.gz forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.bz2 forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.xz forums-3521dfc2787a532365dba12eec669579d15d79f2.zip | |
Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
* p/prep-release-3.1.0-a1:
[prep-release-3.1.0-a1] Update changelog with the latest changes
[ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
[prep-release-3.1.0-a1] Only build packages for the latest olympus versions
[prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes
[prep-release-3.1.0-a1] Update version to 3.1.0-a1
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 4532ecb609..c861028b47 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-dev', + 'phpbb_version' => '3.1.0-a1', '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 094a43c8a0..0aa84a7610 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-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a1'); 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'); |