Merge branch '2018-12-17-update-frontend' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 20:36:21 +0000 (20:36 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 20:36:21 +0000 (20:36 +0000)
commit3879500c87829a5cf1377ca7ccdb7bf92c75367f
tree41712c389aeba5fe31750140b359fd4f5ef040a8
parent7d9254fb4aa17d0b6a7f5358fb5bc7a0406d1a30
parenteb2d34eb6cc3257a260994b7b144a80dd254602c
Merge branch '2018-12-17-update-frontend' into 'develop'

2018 12 17 update frontend

See merge request pleroma/pleroma!565