Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
[akkoma] / .mailmap
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]