Merge branch 'update/pleroma-fe-20180820' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 20 Aug 2018 04:50:27 +0000 (04:50 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 20 Aug 2018 04:50:27 +0000 (04:50 +0000)
commite0c350db390f809a6cbd049a91ac819d740b4eda
treef2bd4a3e0cf6465df27ce2d91cd56978961fe12b
parentb46156be92ecfd9d0e29f0b9021757a15126b2d8
parent7a11ea1cebdc7be48cc375a708f10e5f6eb42f22
Merge branch 'update/pleroma-fe-20180820' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!277