Nils Adermann b203b4afa1 Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus ... * github-marc1706/ticket/11148: [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		2014-08-07 12:06:33 +02:00
..
adm	Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeus	2014-07-31 21:39:48 +02:00
assets	Merge branch 'ticket/sumanai/12843' into develop-ascraeus	2014-07-27 19:51:38 +02:00
bin	[ticket/12663] Have cli.php language file at top level; unrelated to ACP.	2014-07-17 16:54:42 +02:00
cache	[ticket/11700] Add back accidently deleted file in cache dir	2013-09-17 16:18:04 +02:00
config	Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus	2014-08-07 12:06:33 +02:00
develop	[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts	2014-06-26 21:09:19 +02:00
docs	Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeus	2014-07-31 21:39:48 +02:00
download	[ticket/12775] Fix container_builder	2014-07-07 01:02:36 +02:00
ext	[ticket/11163] Add ext/index.htm	2014-05-15 14:11:11 +02:00
files
images
includes	Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus	2014-08-07 12:06:33 +02:00
install	[ticket/12870] Create the migrations table with a method in the migrator	2014-07-27 11:08:13 +02:00
language	Merge pull request #2772 from dhruvgoel92/ticket/12656	2014-07-28 14:45:33 +02:00
phpbb	Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus	2014-08-07 12:06:33 +02:00
store
styles	[ticket/12906] Add rel="help" to FAQ link	2014-08-03 18:00:25 +02:00
.htaccess	Merge branch 'develop-olympus' into develop-ascraeus	2014-05-03 00:37:28 +02:00
app.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
common.php	[ticket/12775] Update doc blocks	2014-07-07 01:02:37 +02:00
composer.json	[ticket/12788] Force 2.3.* on symfony dependencies	2014-07-03 20:50:06 +05:30
composer.lock	[ticket/12788] Force 2.3.* on symfony dependencies	2014-07-03 20:50:06 +05:30
cron.php	[ticket/12898] Call garbage_collection() at the end of cron.php	2014-07-28 14:45:39 +02:00
faq.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
feed.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
index.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
mcp.php	[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global	2014-06-23 22:58:41 +02:00
memberlist.php	[ticket/12804] Disable jabber from memberlist sort options	2014-07-08 00:42:01 +02:00
posting.php	Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus	2014-08-07 12:06:33 +02:00
report.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
search.php	[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts	2014-06-26 21:09:19 +02:00
ucp.php	[ticket/12612] Move function from ucp.php to functions_user.php	2014-06-18 16:57:13 +02:00
viewforum.php	[ticket/12881] Checks earlier if server-side topic marking is enabled	2014-07-25 00:22:46 +02:00
viewonline.php	[ticket/12837] Use else if instead of elseif	2014-07-16 11:19:28 +02:00
viewtopic.php	Merge pull request #2745 from nickvergessen/ticket/12861	2014-07-21 20:48:30 +02:00
web.config