Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 15 Jul 2019 07:11:54 +0000 (14:11 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 15 Jul 2019 07:11:54 +0000 (14:11 +0700)
commit64a946643e6f9159a8029be8ec9e0b71b04906f3
treebf44cb695880f368aa2976fe134e83baea60927a
parenta87c313309b73ced5970c59d00117c357f51fecb
parent46ef8f021635c630bcd6973e6fbb7c58bcafb6bf
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/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs