1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00

Merge branch 'prep-release-3.0.11' into develop-olympus

* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
This commit is contained in:
Andreas Fischer
2012-08-20 16:40:50 +02:00
2 changed files with 8 additions and 2 deletions

View File

@@ -1003,6 +1003,8 @@ function database_update_info()
),
),
),
// No changes from 3.0.11-RC2 to 3.0.11
'3.0.11-RC2' => array(),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
);
@@ -2102,6 +2104,10 @@ function change_database_data(&$no_updates, $version)
// No changes from 3.0.11-RC1 to 3.0.11-RC2
case '3.0.11-RC1':
break;
// No changes from 3.0.11-RC2 to 3.0.11
case '3.0.11-RC2':
break;
}
}