Merge branch 'develop' into feature/masto_api_markers
[akkoma] / .mailmap
1 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
2 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>