add mailmap

pull/191/head
Ariadne Conill 2019-07-11 03:24:50 -05:00
parent 984dc98438
commit c7c3ddbfcf
2 changed files with 2 additions and 1 deletions

1
.mailmap Normal file
View File

@ -0,0 +1 @@
Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>

View File

@ -16,7 +16,7 @@ and backgrounds, and we cherish our strength in diversity.
## Reporting incidents
Please report any incidents which may be perceived as violations to
`nenolod+conduct@dereferenced.org`. Incidents will be investigated and,
`ariadne+conduct@dereferenced.org`. Incidents will be investigated and,
if warranted, acted upon.