Merge branch 'feature/gen-magic' into 'develop'
authorfeld <feld@feld.me>
Wed, 14 Oct 2020 17:31:45 +0000 (17:31 +0000)
committerfeld <feld@feld.me>
Wed, 14 Oct 2020 17:31:45 +0000 (17:31 +0000)
commit20137056900f97af34f4433858cbdf69be6c9840
tree4920c30700ae1a338eff5ce4ca9ca408cdc04bd9
parent9a85ec0da095933cbddfb1dae74d035723032399
parent40f3cdc030536d49c80fe7318ff43cd5ba011df4
Merge branch 'feature/gen-magic' into 'develop'

Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs