summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-02-21 11:47:59 +0100
committerTobias Klauser <tklauser@distanz.ch>2020-02-21 11:47:59 +0100
commit1fe3d20291b339101d8931a15816add1ea85beef (patch)
treee6b33266fee18f77bb47bea19565680372f62a1f
parent8d84c45d196f5d5c4209f82388df7688e7196ddd (diff)
AUTHORS: update
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS1
2 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1ff4ce4..358a3c9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
Jon Schipp <jonschipp@gmail.com>
+Michael R Torres <mic.ric.tor@gmail.com> <6692889+micrictor@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index dfe0f17..6ecd130 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ commits in the netsniff-ng repository:
* Markus Amend <markus.amend@telekom.de>
* Martin Hauke <mardnh@gmx.de>
* Matteo Croce <mcroce@redhat.com>
+ * Michael R Torres <mic.ric.tor@gmail.com>
* Michał Purzyński <michalpurzynski1@gmail.com>
* Nick Grauel <nicolas.grauel@plexxi.com>
* Oliver Smith <oliver@zerolag.com>