Merge branch 'develop' into tests/mastodon_api_controller.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 28 Sep 2019 07:32:03 +0000 (10:32 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 28 Sep 2019 07:36:04 +0000 (10:36 +0300)
commit1053319cd64a0eab40fab6dc9ce3a1b78711069b
tree3d613f7c6129f667ea16aedfe46259d9ca6bde29
parent73ae38ca04df02656bfb239ceba4ffe64879e927
parent50ab06435353144582f6afbf37402aef13c2b3f1
Merge branch 'develop' into tests/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/mastodon_api/mastodon_api_controller_test.exs