diff options
author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:45:17 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:45:17 +0200 |
commit | 49a53755e6da8a8dc5ff09ba1768c9069a00ef52 (patch) | |
tree | 46a0a6ff0a411b16fe23380aa0804691a7182bdc /phpBB/install | |
parent | 60acd63c70eeceff06d913df27a29988692dc7a9 (diff) | |
parent | ece4a2edb7f098bb4f0db7d1e2b6d8d405260b13 (diff) | |
download | forums-49a53755e6da8a8dc5ff09ba1768c9069a00ef52.tar forums-49a53755e6da8a8dc5ff09ba1768c9069a00ef52.tar.gz forums-49a53755e6da8a8dc5ff09ba1768c9069a00ef52.tar.bz2 forums-49a53755e6da8a8dc5ff09ba1768c9069a00ef52.tar.xz forums-49a53755e6da8a8dc5ff09ba1768c9069a00ef52.zip |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/database_update.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 92a1b3a3ab..1addb761ca 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2098,6 +2098,10 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + + // No changes from 3.0.11-RC1 to 3.0.11-RC2 + case '3.0.11-RC1': + break; } } |