aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--AUTHORS.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index f42b324a3..365dafcc3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,6 +17,8 @@ Carl Fürstenberg <azatoth@gmail.com> <carl@excito.com>
Charles McNulty <cmcnulty@kznf.com>
Chris Rebert <github@rebertia.com>
Chris Rebert <github@rebertia.com> <code@rebertia.com>
+Christian Oliff <christianoliff@pm.me>
+Christian Oliff <christianoliff@pm.me> <christianoliff@yahoo.com>
Christopher Jones <chris@cjqed.com> cjqed <christopherjonesqed@gmail.com>
Colin Snover <github.com@zetafleet.com> <colin@alpha.zetafleet.com>
Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1311b2080..06df1a533 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -354,3 +354,4 @@ Pat O'Callaghan <patocallaghan@gmail.com>
JuanMa Ruiz <ruizjuanma@gmail.com>
Ahmed.S.ElAfifi <ahmed.s.elafifi@gmail.com>
Sean Robinson <sean.robinson@scottsdalecc.edu>
+Christian Oliff <christianoliff@pm.me>