Merge branch 'release/2.0.4' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Sun, 10 May 2020 17:13:03 +0000 (17:13 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 10 May 2020 17:13:03 +0000 (17:13 +0000)
Release/2.0.4

See merge request pleroma/pleroma!2503


Trivial merge