Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Fri, 24 May 2019 14:05:57 +0000 (21:05 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Fri, 24 May 2019 14:05:57 +0000 (21:05 +0700)
commitf333041a0a2b9c2f1ef2236254b8dd3e9a55a688
tree317be4a8b7c0b9a231853ee05547554f5da74c3f
parent3b71612d3d8b5e2ad53bda4399eb7f687cd6c30e
parent6499adc6a83b4064f7283de3c729053e62ade7b2
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.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