Merge branch 'update/adminfe-20200121-part2' into 'develop'
authorfeld <feld@feld.me>
Tue, 21 Jan 2020 21:15:32 +0000 (21:15 +0000)
committerfeld <feld@feld.me>
Tue, 21 Jan 2020 21:15:32 +0000 (21:15 +0000)
commit66c6f8f6ecdc6332105d6b7f0383660df4afbd1e
tree3fc34c8b5521538fbcced306e1c4367f228915ef
parent6f2693764768edd004916706b721c656efd2bfdb
parent2860bee604aa4b2b224597426a83cce53749a84b
Merge branch 'update/adminfe-20200121-part2' into 'develop'

AdminFE update, again

See merge request pleroma/pleroma!2125