diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:25:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-26 22:26:59 +0100 |
| commit | 791464258f167a5fa0802e759f0141b1c0d45e39 (patch) | |
| tree | 98fd19aa09b88667b7f31a3d91434812ecd8fa61 /phpBB/install/database_update.php | |
| parent | c4e29bde2331f5ade6883015b8ad90e70bdbd4d3 (diff) | |
| parent | 7520b2763973b7ca892bd8339acb98c894b57a1c (diff) | |
| download | forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.gz forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.bz2 forums-791464258f167a5fa0802e759f0141b1c0d45e39.tar.xz forums-791464258f167a5fa0802e759f0141b1c0d45e39.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b1ee9b8388..fa0fba9dc7 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1058,6 +1058,9 @@ function database_update_info() '3.0.9-RC4' => array(), // No changes from 3.0.9 to 3.0.10-RC1 '3.0.9' => array(), + // No changes from 3.0.10-RC1 to 3.0.10-RC2 + '3.0.10-RC1' => array(), + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ @@ -2125,6 +2128,10 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + // No changes from 3.0.10-RC1 to 3.0.10-RC2 + case '3.0.10-RC1': + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': |
