Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 26 Oct 2018 19:03:49 +0000 (19:03 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 26 Oct 2018 19:03:49 +0000 (19:03 +0000)
commit310a4bc25cf4b30a1c49a2eece9141d2314b11db
treed4b1b128ca8b9c8714d03945e50e6c24953902b6
parent44762daf5193fd8c4919ebb00214316dfd9d6f5c
parent72a880431f43cf919cffa34d534c0b128c7a4e58
Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!396