Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 21 May 2020 13:00:05 +0000 (15:00 +0200)
committerlain <lain@soykaf.club>
Thu, 21 May 2020 13:00:05 +0000 (15:00 +0200)
commit814c3e51714b2a7de30ed751a6aef361fc712807
treee0db564ad32b79a357095a7b1131787b23b06fb9
parentd19c7167704308df093f060082639c0a15996af7
parent42b06d78dfc9cec2a31bcb4676cc0135863ca97d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex
lib/pleroma/web/router.ex
test/web/activity_pub/side_effects_test.exs
test/web/common_api/common_api_test.exs