Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 3 Dec 2018 06:03:09 +0000 (06:03 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Dec 2018 06:03:09 +0000 (06:03 +0000)
commita3f9cca78c16026025f0cbadc50c7683d7444e86
treec43357f3dc1183f60a2dfbd7f6edfc25b455fbc8
parente1204c6f25526470e410bb34595ec1e7b3502371
parenta7b1a66be3d48cf87c2417d248d9131390eb23ed
Merge branch 'update-pleroma-frontend' into 'develop'

update-pleroma-frontend

See merge request pleroma/pleroma!494