Merge branch 'release/1.1.6' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Tue, 19 Nov 2019 20:04:19 +0000 (20:04 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 19 Nov 2019 20:04:19 +0000 (20:04 +0000)
Release/1.1.6

See merge request pleroma/pleroma!1995


Trivial merge