Merge branch 'feature/configurable-blocks' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)
commitdfc96f222cc65eda92e5696a2fc2d6d926f960ed
treed4e9c57c4005af7348b11795834d2993585708c1
parent92135d00fc6a9dcdeda32a55ac7a88353b7f96f2
parentea214b8ba65c0911aed6d2b019465272fc77fbc4
Merge branch 'feature/configurable-blocks' into 'develop'

Add more configurability to how blocks work

See merge request pleroma/pleroma!203
CONFIGURATION.md
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex