Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:09:38 +0000 (01:09 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 01:09:38 +0000 (01:09 +0000)
commit8eed5938d5fb6cac9075d2b75b69d2c93316db01
tree3f515410e7b016cfe8789332c26dc28e36cde5c8
parentc2650f0ffb5938005baf437dfa69bbf05da0cc71
parentf829b18273558576b0a67dd89387340dede675c0
Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!344