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)
commita6283bbae13a873af969336bd4e62011777a1a70
tree12ddd0c3bf128fe0d897ca75c044726666f20207
parent019a192e43c2421c74e5126e753aac095db8ad54
parent489201d5d549a1ad32bf55d7a29d53c8f2316f14
Merge branch 'release/2.0.4' into 'stable'

Release/2.0.4

See merge request pleroma/pleroma!2503