Merge branch 'develop' into feature/matstodon-statuses-by-name
[akkoma] / .mailmap
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
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]