Merge branch 'update/pleroma-fe-20180821' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 20 Aug 2018 18:17:05 +0000 (18:17 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 20 Aug 2018 18:17:05 +0000 (18:17 +0000)
commit7266cc67ffa46564c26e4aa2924ed53f3d886ff2
treec2d9b057ee84d12a648d6ada1230e9dc841b2ff9
parentf1c407e777cc1e783ad6930a89ebaa01d9a42c3b
parentd8fb3405658611cc80935ed416eb1b119b9a8b87
Merge branch 'update/pleroma-fe-20180821' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!279