Merge branch 'develop' into feature/thread-muting
authorKaren Konou <konoukaren@gmail.com>
Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)
committerKaren Konou <konoukaren@gmail.com>
Mon, 11 Feb 2019 11:10:49 +0000 (12:10 +0100)
commitac72b578da673282b927b945bfe03cd3012444b6
tree45b8c075aa883ca47fd24f3e71f6740bd2f2308b
parentc01ef574c192488c2643a20b4064439757613449
parent48552b38b2dd26bb832e940a0e52c0e1c2165b31
Merge branch 'develop' into feature/thread-muting
lib/pleroma/notification.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/mastodon_api/mastodon_api_controller_test.exs