Merge branch 'develop' into feature/thread-muting
authorKaren Konou <konoukaren@gmail.com>
Fri, 8 Feb 2019 11:44:02 +0000 (12:44 +0100)
committerKaren Konou <konoukaren@gmail.com>
Fri, 8 Feb 2019 11:44:02 +0000 (12:44 +0100)
1  2 
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex

Simple merge