Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 25 Oct 2018 00:16:15 +0000 (00:16 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 25 Oct 2018 00:16:15 +0000 (00:16 +0000)
commit4b2a586942edd5510e1835d57149387292052523
tree2f02f3e4d40ee599b835c7a457a670b8bab8a30e
parent8cc08b94ec7ea5fc1073e52bcc04dbb6f4641665
parent7cb227dc62e95cb8aa01b563be3a66ab98c1347f
Merge branch 'update-pleroma-frontend' into 'develop'

Update pleroma frontend

See merge request pleroma/pleroma!385