Merge branch 'develop' into feature/admin-api-status-count-per-instance
[akkoma] / .mailmap
1 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
2 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>