Merge branch 'update/pleroma-fe-20180818' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 18 Aug 2018 18:24:33 +0000 (18:24 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 18 Aug 2018 18:24:33 +0000 (18:24 +0000)
commitb46156be92ecfd9d0e29f0b9021757a15126b2d8
tree27922c3dd4bc3698dd518fa6639cfc62e61d7984
parent4ad7531dc0ae3d27a53f41d77f9a30ac90bf09d5
parentd8bb27970b73d831262f70e961fbb4f123ba8526
Merge branch 'update/pleroma-fe-20180818' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!276