Merge branch 'feature/domain-blocks' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)
commit7f79b467b1b56ce9ac7f544aaa2b687dcae341c5
tree5c2b067d132fda185016982e1a8a1445eff0ce7d
parent45a935f0bd86501d64be7f453c08a47e46565ef9
parent29c9c8d93b263e57915158d09761bc6586826798
Merge branch 'feature/domain-blocks' into 'develop'

Domain blocks

See merge request pleroma/pleroma!190
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs