Merge pull request #2001 from thaJeztah/update-mailmap

Update .mailmap to make auto-generating work
This commit is contained in:
Justin Cormack 2017-06-08 14:55:29 +01:00 committed by GitHub
commit 1f56da3288

View File

@ -10,9 +10,11 @@ Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com>
Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org>
Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me>
Dan Finneran <dan@thebsdbox.co.uk> <daniel.finneran@gmail.com>
Dave Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
Dave Scott <dave.scott@docker.com> <dave@recoil.org>
Dave Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
Dan Finneran <dan@thebsdbox.co.uk>
David Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
David Scott <dave.scott@docker.com> <dave@recoil.org>
David Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
David Scott <dave.scott@docker.com>
Dave Tucker <dt@docker.com> <dave@dtucker.co.uk>
David Gageot <david.gageot@docker.com> <david@gageot.net>
David Sheets <david.sheets@docker.com> <dsheets@docker.com>
@ -26,6 +28,7 @@ Magnus Skjegstad <magnus.skjegstad@docker.com> <magnus@skjegstad.com>
Mindy Preston <mindy.preston@docker.com> <meetup@yomimono.org>
Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
Radu Matei <matei.radu94@gmail.com>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>