Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 4 Jun 2019 09:28:23 +0000 (16:28 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 4 Jun 2019 09:28:23 +0000 (16:28 +0700)
commit9ce928d8238877f870e099cb2fe010d322717856
tree5ef9fb748ea007f31e1ce39a091e66f808672374
parenta7affbdd6d46caddea05ee6b34e0b2a24a62e721
parentd977d73b91dbf8e9129de0478c51114d7d462edf
Merge remote-tracking branch 'pleroma/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