Merge branch 'update-changelog' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sun, 12 May 2019 13:22:13 +0000 (13:22 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 12 May 2019 13:22:13 +0000 (13:22 +0000)
commit3ded995253c9a430fcef1b210eb20fd33a409598
treed143d4406fc4aa47f98d97f331f1774dac49eb8a
parent131f88320740bec9c74e4280a6b1a7d8641ee367
parent2a4e41acb4383f6a9dd60a65d8251b27130fe7cc
Merge branch 'update-changelog' into 'develop'

Update changelog

See merge request pleroma/pleroma!1141