Merge branch 'earmark' into 'develop'
authorfeld <feld@feld.me>
Tue, 4 May 2021 13:29:14 +0000 (13:29 +0000)
committerfeld <feld@feld.me>
Tue, 4 May 2021 13:29:14 +0000 (13:29 +0000)
commitd5263bfcf37cb1f6190d0848c6b417d33d8fb979
treed6884f389f87a483efbbaf571da97260eebd0337
parent377f84f3678f9c2541fbd4a200cd93c5ab0dea24
parentdca87c5e7b4b12918cf59a83a77be389a7e0df01
Merge branch 'earmark' into 'develop'

Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076