lain f4469dc741 Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261		2020-07-09 13:09:31 +00:00
..
controllers	Merge branch '1925-muting-reblogs' into 'develop'	2020-07-09 12:10:26 +00:00
views	Merge branch 'features/favicons' into 'develop'	2020-07-09 13:09:31 +00:00
mastodon_api_controller_test.exs
mastodon_api_test.exs