Merge branch 'develop' into 'reactions'
authorlain <lain@soykaf.club>
Sun, 10 Nov 2019 11:32:50 +0000 (11:32 +0000)
committerlain <lain@soykaf.club>
Sun, 10 Nov 2019 11:32:50 +0000 (11:32 +0000)
commita88e834dbadcd3485a6187d512865ab95bb9c1f0
tree15f0d2449c7dc39337d725d74e6b097fc6256ddb
parentb22ee9d9666c49d1a3b1757b275e9d303eed4afc
parent3a1aaadc18372fb8c76fa72cd20ed65dd85b2326
Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs