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)
commit98ec578f4d36ff1a94ee59087f57704ed109bd9c
treeb3e6c350e87e7091b3b253ae5d4256446b2518b5
parent97a2789caa5d269975da22a2153de22b7978ad36
parentd84392c9e05342a70d3a759ac380dcd41f22ed0e
Merge branch 'develop' into feature/thread-muting
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex