Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 5 Jun 2019 10:53:15 +0000 (17:53 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 5 Jun 2019 10:53:15 +0000 (17:53 +0700)
commitcfa5572d28a5a7b58d73106c32420b14ffd9fd2a
treed093f206f5ea5b792b22b0e59b31b76ac64c1bc6
parent6ba9055b51a454baaf063943e72a39006f7e5fad
parente4babb1c9ff4c28ff08888736cc330a48b19b396
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
CHANGELOG.md
docs/api/differences_in_mastoapi_responses.md
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
test/web/common_api/common_api_test.exs