diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-10 23:11:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-10 23:11:29 +0200 |
| commit | 09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48 (patch) | |
| tree | b86e32d9ef53c5e45458f091aa3d6be1dcf7113a /phpBB/install | |
| parent | e2d27a30a6fa2eafb1950f171bad1f6b69fce758 (diff) | |
| parent | e4707a8be75263e610b00b3d600144e797f576d9 (diff) | |
| download | forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.gz forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.bz2 forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.tar.xz forums-09e0460e5b53f83f4c06703c8bd8f1cb0f22eb48.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.9] Bumping version number for 3.0.9 final.
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index fc205d4e56..615122da4f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1050,6 +1050,8 @@ function database_update_info() '3.0.9-RC2' => array(), // No changes from 3.0.9-RC3 to 3.0.9-RC4 '3.0.9-RC3' => array(), + // No changes from 3.0.9-RC4 to 3.0.9 + '3.0.9-RC4' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ @@ -2073,6 +2075,10 @@ function change_database_data(&$no_updates, $version) case '3.0.9-RC3': break; + // No changes from 3.0.9-RC4 to 3.0.9 + case '3.0.9-RC4': + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': set_config('use_system_cron', 0); |