projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a85ec0 40f3cdc)
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)
Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534

1  2 
test/pleroma/web/activity_pub/activity_pub_test.exs patch | diff1 | diff2 | blob | history
test/pleroma/web/common_api_test.exs patch | diff1 | diff2 | blob | history
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs patch | diff1 | diff2 | blob | history

diff --cc test/pleroma/web/common_api_test.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git