Merge branch '2018-12-29-update-frontend' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 29 Dec 2018 13:47:45 +0000 (13:47 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 29 Dec 2018 13:47:45 +0000 (13:47 +0000)
commite8ba390fe9fdd033c2d373b9272cd25cbc032365
tree27d103a4f6c78f84fd3ba5d8f9b68fb7b3b716de
parent3dc5f04976293fbcedfc01281f89c4f54c995d59
parente1227d812c0611ca8f21ee736f5441703cd0d666
Merge branch '2018-12-29-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!606