Merge branch 'chore/CHANGELOG' into 'develop'
authorfeld <feld@feld.me>
Thu, 1 Apr 2021 15:26:46 +0000 (15:26 +0000)
committerfeld <feld@feld.me>
Thu, 1 Apr 2021 15:26:46 +0000 (15:26 +0000)
commitf8cef70416b5da5fabdac89ad95589e735fe85a9
treee117921d6cc8d623a3e6ec6a9ad803c60298d04c
parent96fe4dd4e2de5d1211e0dbe9f09be502bc46e0da
parent31ce8a37304e24381b26d678dfbbc7b7a6b1ba35
Merge branch 'chore/CHANGELOG' into 'develop'

Fix CHANGELOG entry meant for next release

See merge request pleroma/pleroma!3387