Merge branch '2018-12-10-update-frontend' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 10 Dec 2018 19:55:32 +0000 (19:55 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 10 Dec 2018 19:55:32 +0000 (19:55 +0000)
commit37bd32e58b4c7b5005b05138d6bbe832dd171095
tree0aaa1bee7665efe929ec63d247e74898c67efa30
parent0863ec27379a09ee8367fe61da9e63c90cfe18ee
parentd6bf06ab4fb493d5e240092988fe37f2d6a655a3
Merge branch '2018-12-10-update-frontend' into 'develop'

2018 12 10 update frontend

See merge request pleroma/pleroma!534