diff options
author | Tristan Darricau <github@nicofuma.fr> | 2014-09-06 13:54:16 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-06 13:54:16 +0200 |
commit | e0711b417fb9e9106af52dcde51ca20dd7b056f2 (patch) | |
tree | 4a866d9599bc802800fdb17420efd23bfc640f53 /phpBB/phpbb/db/driver/mssql.php | |
parent | bc38730ab5e7d59e8e0b1b13c0cd8f3fb32f271a (diff) | |
parent | 6387bf8d1399b9ccf995b8eb5a4b93425d27e873 (diff) | |
download | forums-e0711b417fb9e9106af52dcde51ca20dd7b056f2.tar forums-e0711b417fb9e9106af52dcde51ca20dd7b056f2.tar.gz forums-e0711b417fb9e9106af52dcde51ca20dd7b056f2.tar.bz2 forums-e0711b417fb9e9106af52dcde51ca20dd7b056f2.tar.xz forums-e0711b417fb9e9106af52dcde51ca20dd7b056f2.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
Diffstat (limited to 'phpBB/phpbb/db/driver/mssql.php')
0 files changed, 0 insertions, 0 deletions