Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
[akkoma] / .mailmap
1 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
2 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>