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)
commit8d13c42926450aff6a0062f092cd1a5d59f99869
tree0cb14ad1a42e791bee88868b5848312e2be48d73
parent17d01869ea82e1b0ad4b78479cabe0637d04d1cf
parentc953ae8c3d75beb55ba02b3bada864d019470b05
Merge branch 'feature/adminfe' into 'develop'

Feature/adminfe

See merge request pleroma/pleroma!1116