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)
Release/1.1.7

See merge request pleroma/pleroma!2065


Trivial merge