diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 23:11:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 23:11:27 +0200 |
| commit | 4af503e11bc2c42654cf783f031bdb074fdd91ed (patch) | |
| tree | d2d3c368ce912650ef4e82f5d9f4376ec1a60987 /phpBB/install | |
| parent | b0eb7768bd3236eed62639be3b74a1736f6872c7 (diff) | |
| parent | 118c5d90daa783ff55319e6121c0fc77166fe58c (diff) | |
| download | forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.gz forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.bz2 forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.tar.xz forums-4af503e11bc2c42654cf783f031bdb074fdd91ed.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.11 release.
[develop-olympus] Bump version numbers for 3.0.11-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 1892ab07a3..06199aea47 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1027,7 +1027,7 @@ function database_update_info() // this column was removed from the database updater // after 3.0.9-RC3 was released. It might still exist // in 3.0.9-RCX installations and has to be dropped in - // 3.0.11 after the db_tools class is capable of properly + // 3.0.12 after the db_tools class is capable of properly // removing a primary key. // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), @@ -1072,7 +1072,7 @@ function database_update_info() // No changes from 3.0.10 to 3.0.11-RC1 '3.0.10' => array(), - /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */ // Changes from 3.1.0-dev to 3.1.0-A1 '3.1.0-dev' => array( |