Merge branch 'develop' into refactor/subscription
authorRoman Chvanikov <chvanikoff@pm.me>
Sat, 14 Sep 2019 15:29:51 +0000 (18:29 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Sat, 14 Sep 2019 15:29:51 +0000 (18:29 +0300)
commitd7457c9165b83c0f1514cf0532b5a8bdc515ea02
tree65209338d595c55397f85ad2295bc48b778b820e
parent0bd2b85edbf3b7062570778649cf2b77cc7a0bce
parent3ae448b592214b43af1d079c997c6f6b91d31aeb
Merge branch 'develop' into refactor/subscription
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs