Merge branch '2018-12-13-update-frontend' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 14 Dec 2018 08:23:56 +0000 (08:23 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 14 Dec 2018 08:23:56 +0000 (08:23 +0000)
commit36b0af760130f73aec6b095b6e1282479f8b0b61
treee436572b469e5b2aa8253feb2fecb8ef54acb252
parentb19ee62252114d024b52aff3ebb01ac16244990c
parent72945b5b32f5f690bdc3bd22534ae5f3ac451498
Merge branch '2018-12-13-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!544