Merge branch 'develop' into 'domain-block-precedence'
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 10 Dec 2019 16:54:25 +0000 (16:54 +0000)
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 10 Dec 2019 16:54:25 +0000 (16:54 +0000)
commit8cfaab8f04cae6fcc20a37cdb463ee0c93b71217
tree5ea3e43a73796f264508b583051f6f2143071f00
parent5abee19b63aa1577f8895b48ae69f0a51edb4dc3
parentaac0187ec13078d2756db1671e644d6eb9c0947b
Merge branch 'develop' into 'domain-block-precedence'

# Conflicts:
#   lib/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs