Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 7 Oct 2018 01:09:33 +0000 (01:09 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 7 Oct 2018 01:09:33 +0000 (01:09 +0000)
commita15eac05a65d04b985505e0a284fe861a1da270d
treebb6cb55c21b55c7d6665be18c1959843ab36661d
parent614e47aa7c7f44249961213905860d3076326977
parentbe7bb90bef7875dd992ceb20409075597959c5d5
Merge branch 'update-pleroma-frontend' into 'develop'

update-pleroma-frontend

See merge request pleroma/pleroma!369