Merge branch 'chore/use-the-alias' into 'develop'
[akkoma] / .mailmap
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-07-12 Roman Chvanikovmerge develop
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]