Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
[akkoma] / .mailmap
1 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
2 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>