diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-04-30 13:17:03 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-04-30 13:17:03 -0500 |
| commit | 52fc59f125c10ad73b9fd1a0639b6dc5681776ca (patch) | |
| tree | 7de32329acbdd4bdf5c753678a2d459c61b58d80 /.mailmap | |
| parent | a8fa00ef666f574aec8048626aed78a7d62e6915 (diff) | |
| parent | 377f84f3678f9c2541fbd4a200cd93c5ab0dea24 (diff) | |
| download | pleroma-52fc59f125c10ad73b9fd1a0639b6dc5681776ca.tar.gz pleroma-52fc59f125c10ad73b9fd1a0639b6dc5681776ca.zip | |
Merge remote-tracking branch 'upstream/develop' into earmark
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org> Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com> +rinpatch <rin@patch.cx> <rinpatch@sdf.org> |