Merge branch 'feature/adminfe' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 11 May 2019 01:34:17 +0000 (01:34 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 11 May 2019 01:34:17 +0000 (01:34 +0000)
Feature/adminfe

See merge request pleroma/pleroma!1116


Trivial merge