Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi...
authorlain <lain@soykaf.club>
Fri, 3 Jul 2020 14:44:31 +0000 (16:44 +0200)
committerlain <lain@soykaf.club>
Fri, 3 Jul 2020 14:44:31 +0000 (16:44 +0200)
commitd3efb50262e7922fc1aa80625679a7e29bb65836
tree1b9c37c851739b041462a5bf50864a4c5d24ffd8
parent244655e884130df6dccabc0d2d78d33857809a36
parent19fbfbb767169b58a8f6558d0ad1a9be6425b59d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
lib/pleroma/web/api_spec/schemas/status.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/status_view_test.exs