Merge branch 'update/pleroma-fe-20180831' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:36:04 +0000 (04:36 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:36:04 +0000 (04:36 +0000)
commit03ecbe045605d04d7ceba2f3b5d16d620d97e8b2
tree0aa823191bede9c66d2ae4ae990a781e9e0e5f83
parentd40466c291e54bcc31b2ea7ac772ba8229e9547b
parent2b4b4888a9d4459b1a75572c52b4707b61c476b8
Merge branch 'update/pleroma-fe-20180831' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!311