Merge branch 'develop' into issue/941
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 4 Jun 2019 06:49:08 +0000 (09:49 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 4 Jun 2019 06:49:08 +0000 (09:49 +0300)
commit4f2e359687b8866a26130314315415a787678881
tree51e29be10335dab73962952c2f1b0407cbd52ecb
parent64ada7f960eb45d5e06d431c0c27be1014106ff9
parent0f8f63c6bb4a26615277f43ed4f30f032d71df83
Merge branch 'develop' into issue/941
12 files changed:
CHANGELOG.md
config/config.exs
docs/api/differences_in_mastoapi_responses.md
docs/config.md
lib/pleroma/user/info.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/twitter_api/views/user_view.ex
test/web/mastodon_api/account_view_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/views/user_view_test.exs