1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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

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

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
This commit is contained in:
Andreas Fischer
2013-09-27 01:32:09 +02:00
2 changed files with 8 additions and 2 deletions

View File

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