Merge branch 'release/1.1.5' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Sat, 9 Nov 2019 13:32:11 +0000 (13:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 9 Nov 2019 13:32:11 +0000 (13:32 +0000)
Release/1.1.5

See merge request pleroma/pleroma!1954


Trivial merge