Merge branch 'release/1.1.7' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Sat, 14 Dec 2019 15:01:09 +0000 (15:01 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 14 Dec 2019 15:01:09 +0000 (15:01 +0000)
commitecb3386f939de3ffba16f9419994a009f2e59ded
treefebe52f1b2cf59be4530ebc4f223f06e342c207c
parent0ba3f1ffb28792c21809fa9a30fc03a7a52d9361
parent3b407a9a295da3f6c2fc91982088f066f2c3c711
Merge branch 'release/1.1.7' into 'stable'

Release/1.1.7

See merge request pleroma/pleroma!2065