diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:49 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:49 +0200 |
| commit | 89a6fed91d9344152f0b2a0779d3d458f3311ecf (patch) | |
| tree | 7979f44c8d5bd6532491fe2261acc4fa348b8fe2 /phpBB/phpbb/log/null.php | |
| parent | 57f9a96f4b64c323448dfb83ed0816a2abe727e7 (diff) | |
| parent | b203b4afa18e7e4774bec525620ec2a390ac374f (diff) | |
| download | forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.gz forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.bz2 forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.xz forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
[ticket/11148] Change expected output with disallowed content in test
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
[ticket/11148] Get rid of extra line in mimetype guesser setter doc block
[ticket/11148] Add missing parts to docblock of get_mimetype() method
[ticket/11148] Default to application/octet-stream if no mimetype given
[ticket/11148] Use mimetype guesser for uploaded avatars
[ticket/11148] Pass mimetype guesser to upload_attachment() function
[ticket/11148] Add mimetype guesser to filespec and fileupload class
Diffstat (limited to 'phpBB/phpbb/log/null.php')
0 files changed, 0 insertions, 0 deletions