Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 17 May 2019 12:57:14 +0000 (19:57 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 17 May 2019 12:57:14 +0000 (19:57 +0700)
commit557f0e33a7de7ef89c72441ffc3a9c09c56fe9a7
tree8044adbc3645ccd1c7dce13b396e7d23db51a0fb
parentf2936e0a0723956c167a06dc51518da172a508b2
parente5b34f5e0544371603bc2b570c26ede3182c2f8b
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
test/web/activity_pub/activity_pub_test.exs
test/web/common_api/common_api_test.exs