Merge branch 'develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 11 Jul 2019 06:26:59 +0000 (13:26 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 11 Jul 2019 06:26:59 +0000 (13:26 +0700)
commit182f7bbb1170c44eac4ab4a9efa4ff0bff991c98
treef4c6fe46e82f667be49c8e6aad0ed3b418e4332f
parentddd4a09b72ede65345ddf45a68eb239b54eda86c
parent4016341a77337e3b71295d27808eebc05152b086
Merge branch 'develop' into feature/addressable-lists
CHANGELOG.md
docs/api/differences_in_mastoapi_responses.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/publisher.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/salmon/salmon.ex
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs