Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 16:40:46 +0000 (16:40 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 16:40:46 +0000 (16:40 +0000)
commit70d18a278c76e5681543a21150884f9e5dfcd097
treeaca3890474b394d2c86cbd191f94c217f260a53f
parent57101955b681b13dfc318d3210a0b59cc377cd8b
parent5bfd4006ae29e6bf6f076b15bc704aae5f695af1
Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'

Pleroma 1.0.90 (aka 1.1 RC1).

See merge request pleroma/pleroma!1754