Merge branch 'chore/changelog-sync' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 26 Sep 2019 22:17:20 +0000 (22:17 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 26 Sep 2019 22:17:20 +0000 (22:17 +0000)
commit67a659a096ecadc66eac1018d87516a149825c0a
tree1ca49d8b24a8e6576f8ec4068639f0bcf1934774
parentcb282f2ccde11f877213988e288f4ba9578d0aed
parent3ec81b816f436cf37efd6a133f02b49d84501b59
Merge branch 'chore/changelog-sync' into 'develop'

Sync changelogs between master and develop

See merge request pleroma/pleroma!1724