Merge branch 'develop' into feature/gen-magic
authorMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 15:08:38 +0000 (10:08 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 13 Oct 2020 15:08:38 +0000 (10:08 -0500)
commitb738f709532ff18845f5d8cc3888d0bd67f750ab
tree87596ad2bf711bdbc3dc75293996157c3c99d955
parentc4fae2611ff4da7c418de236fa643021ddc778c8
parent8b6221d4ecd1d7e354e7de831dd46e285cb85077
Merge branch 'develop' into feature/gen-magic
config/config.exs
config/description.exs
lib/pleroma/application.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
test/pleroma/upload_test.exs
test/pleroma/web/activity_pub/activity_pub_controller_test.exs