diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-22 18:06:42 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-22 18:06:42 -0500 |
| commit | 4f477791ec83526b98153ad2b2d4b207554af15a (patch) | |
| tree | 58a2e4a6d864a53ef06b0d070b4dc7a8b4880567 /phpBB/includes/diff/diff.php | |
| parent | 7829d2a8c8c2969597db412e7689824b0a9e9a9a (diff) | |
| parent | 86f0c0a6d5d65141fbce138fc7702795b39693cd (diff) | |
| download | forums-4f477791ec83526b98153ad2b2d4b207554af15a.tar forums-4f477791ec83526b98153ad2b2d4b207554af15a.tar.gz forums-4f477791ec83526b98153ad2b2d4b207554af15a.tar.bz2 forums-4f477791ec83526b98153ad2b2d4b207554af15a.tar.xz forums-4f477791ec83526b98153ad2b2d4b207554af15a.zip | |
Merge PR #1152 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11278] Comment out the code for dropping the Q&A tables
[ticket/11278] Fix not running queries from db tools in database update
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions