Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [ticket/10003] Fixed comment referring to db_tools duplication.
  [ticket/10003] Require db_tools.php in database_update.php.
  [ticket/10003] Use phpbb_db_tools in database_update.php.
  [ticket/10003] Delete the copy of db_tools in database_update.php.

Conflicts:
	phpBB/install/database_update.php

...

This commit is contained in:

Andreas Fischer

2011-07-09 16:01:54 +02:00

parent 9c6c5895bc 9efb080875

commit e2d27a30a6

1 changed files with 5 additions and 2242 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2247

phpBB/install/database_update.php

File diff suppressed because it is too large Load Diff