Merge branch 'feature/mrf-user-allowlist' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Tue, 27 Nov 2018 00:12:03 +0000 (00:12 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Tue, 27 Nov 2018 00:12:03 +0000 (00:12 +0000)
commit5ae6088d37c193b06612669307163b6b86f4189a
tree95a1eb0e5487f7005b077ffebb61ddfa0ea88f21
parenta76058fc1d2ad117538f44305e5c949e73cfd214
parent6979eeda34a7c9c201c0816f322c3a29c6d947e6
Merge branch 'feature/mrf-user-allowlist' into 'develop'

MRF: user allowlist module

See merge request pleroma/pleroma!477