Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / .mailmap
2019-07-14 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-11 kaniiniMerge branch 'fix/1019-refactor' into 'develop'
2019-07-11 kaniiniMerge branch 'chore/mailmap' into 'develop'
2019-07-11 Ariadne Conilladd mailmap [ci skip]