diff options
| author | Meitar M <meitarm@gmail.com> | 2018-08-13 18:00:11 +0000 |
|---|---|---|
| committer | Meitar M <meitarm@gmail.com> | 2018-08-13 18:00:11 +0000 |
| commit | faeaaaccebb212aa458cf47dfff26fe31333a0b7 (patch) | |
| tree | 8f3236a78e51e0dd215751f77111873fe87d1f57 /.github/.mailmap | |
| parent | Merge branch 'upstream-master' (diff) | |
| parent | Merge pull request #1469 from NickBusey/patch-4 (diff) | |
| download | awesome-selfhosted-faeaaaccebb212aa458cf47dfff26fe31333a0b7.tar.gz awesome-selfhosted-faeaaaccebb212aa458cf47dfff26fe31333a0b7.zip | |
Merge branch 'upstream-master'
Diffstat (limited to '.github/.mailmap')
| -rw-r--r-- | .github/.mailmap | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/.mailmap b/.github/.mailmap index 6d417742..854bc2bf 100644 --- a/.github/.mailmap +++ b/.github/.mailmap @@ -1,8 +1,10 @@ Kickball <ed.kickball@hotmail.com> <ed.kickball@hotmail.com> -Andrew Rylatt <AndyR207@users.noreply.github.com> <AndyR207@users.noreply.github.com> <arylatt@users.noreply.github.com> +Andrew Rylatt <arylatt@users.noreply.github.com> Andrew Rylatt +Andrew Rylatt <arylatt@users.noreply.github.com> <AndyR207@users.noreply.github.com> +Andrew Rylatt <arylatt@users.noreply.github.com> <andrew@rylatt.me> +Andrew Rylatt <arylatt@users.noreply.github.com> <andrew.rylatt@citrix.com> n8225 <n8225@users.noreply.github.com> <nrew225@gmail.com> Thomas Dalichow <info@thomasdalichow.de> <2012-02-05.github.com@thomasdalichow.de> -Andrew Rylatt <AndyR207@users.noreply.github.com> <andrew@rylatt.me> Keith Thibodeaux <kthibodeaux@peachtreebilling.com> Keith Thibodeaux <kthib89+github@gmail.com> Madhu GB <github@madhugb.com> Madhu GB <me@madhugb.com> Miguel Piedrafita <github@miguelpiedrafita.com> <git@miguelpiedrafita.com> |