Merge branch 'update/pleroma-fe-20180824' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 24 Aug 2018 22:00:13 +0000 (22:00 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 24 Aug 2018 22:00:13 +0000 (22:00 +0000)
commit66bc37925e8896d156bbbb4a89a73cf8d9c88d56
tree67375e16881487ebeda6e43c896c41cdfea6edaa
parentae0e41fd8b583be818f3576cd260e66a689923cb
parent47661ce44b8d6a005547e81eb34d86bee290759e
Merge branch 'update/pleroma-fe-20180824' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!292