diff options
| author | Janos Guljas <janos@resenje.org> | 2018-02-23 01:50:47 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-02-23 01:51:34 +0800 |
| commit | 6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e (patch) | |
| tree | 442ae3e5d75fa5418b362474754d319a7fdfa8f0 /.mailmap | |
| parent | a3a07350dcef0ba39829a20d8ddba4bd3463d293 (diff) | |
| parent | 221486a29109803286c1448426d6180ef5024cf0 (diff) | |
| download | dexon-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.gz dexon-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.zst dexon-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -65,7 +65,8 @@ Enrique Fynn <enriquefynn@gmail.com> Vincent G <caktux@gmail.com> -RJ Catalano <rj@erisindustries.com> +RJ Catalano <catalanor0220@gmail.com> +RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com> Nchinda Nchinda <nchinda2@gmail.com> @@ -109,3 +110,14 @@ Frank Wang <eternnoir@gmail.com> Gary Rong <garyrong0905@gmail.com> Guillaume Nicolas <guin56@gmail.com> + +Sorin Neacsu <sorin.neacsu@gmail.com> +Sorin Neacsu <sorin.neacsu@gmail.com> <sorin@users.noreply.github.com> + +Valentin Wüstholz <wuestholz@gmail.com> +Valentin Wüstholz <wuestholz@gmail.com> <wuestholz@users.noreply.github.com> + +Armin Braun <me@obrown.io> + +Ernesto del Toro <ernesto.deltoro@gmail.com> +Ernesto del Toro <ernesto.deltoro@gmail.com> <ernestodeltoro@users.noreply.github.com> |