Merge branch 'update/pleroma-fe-20180922' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 22 Sep 2018 05:08:37 +0000 (05:08 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 22 Sep 2018 05:08:37 +0000 (05:08 +0000)
commit72520550781bd9d3cf2ac18630d5e7f89546f84f
tree0acaeeb9e68ca238976a303044174a7f3e1308d4
parent3193423be9f288b186fe97997228aae84a8e730c
parentbb213a85c51d9da611b348a01b294f2f38e6d95a
Merge branch 'update/pleroma-fe-20180922' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!357