Merge branch 'changelog' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)
commit2951714429f3ea2d6aef81cbe8edc3dcd6dff6e6
tree172cf66a30a17cb442d13849ce93de64c073c191
parent4a8b5226393752e1533bddce6420f3622a5be99f
parent2442b5c18e49f622a9cd5cad371fdb9c2844ad7a
Merge branch 'changelog' into 'develop'

changelog

See merge request pleroma/pleroma!1469