Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 15:35:47 +0000 (15:35 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 15:35:47 +0000 (15:35 +0000)
commit4f3b8d5399e2023d901412bc01ae04ee1334f499
tree072183714920c440724f49f881ba21225212f6e4
parent2b98ef832ca7db7be86667646502c47a43e5d7af
parent979f66a99c28007d38100000c88f659638d58294
Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'

maint/1.1: update pleroma fe

See merge request pleroma/pleroma!1750