1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

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
This commit is contained in:
Andreas Fischer
2011-11-26 22:25:39 +01:00
2 changed files with 9 additions and 2 deletions

View File

@@ -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':