Merge branch 'develop' into stable
[akkoma] / .mailmap
1 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
2 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>
3 rinpatch <rin@patch.cx> <rinpatch@sdf.org>