diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-09 16:01:54 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-09 16:01:54 +0200 |
| commit | e2d27a30a6fa2eafb1950f171bad1f6b69fce758 (patch) | |
| tree | d48430caf2bfcb82826d16c0428598dfad430a65 /phpBB/styles | |
| parent | 9c6c5895bcb6c5d16c7014ae444d817795e20039 (diff) | |
| parent | 9efb08087564f8fc3a68954499b03e6e1720f4d3 (diff) | |
| download | forums-e2d27a30a6fa2eafb1950f171bad1f6b69fce758.tar forums-e2d27a30a6fa2eafb1950f171bad1f6b69fce758.tar.gz forums-e2d27a30a6fa2eafb1950f171bad1f6b69fce758.tar.bz2 forums-e2d27a30a6fa2eafb1950f171bad1f6b69fce758.tar.xz forums-e2d27a30a6fa2eafb1950f171bad1f6b69fce758.zip | |
Merge branch 'develop-olympus' into develop
* 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
Diffstat (limited to 'phpBB/styles')
0 files changed, 0 insertions, 0 deletions