Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 21 Jun 2018 07:09:57 +0000 (07:09 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 21 Jun 2018 07:09:57 +0000 (07:09 +0000)
commitad28854f477141dc9b6a01f7e4465c07bb0f896c
tree272e870fa168507f2c7aaa8702e3bdfa831f0b61
parent90cf75f4a781f2eb7016a4a165a8617d4352451b
parent60d6038be57aaa90f1d8ba9a05ecbee03b59fc82
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'

mrf simple: add accept lists

See merge request pleroma/pleroma!231