diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-04-14 17:33:10 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-04-14 17:33:10 +0800 |
| commit | 6876e92f8d467dbefd88bbd91df700883ab9c2af (patch) | |
| tree | 1bf152b98887bd251ff124f09238dcab7bdddb62 /.mailmap | |
| parent | 15f32a8d5758544b7993e46a7addf082994a5a3e (diff) | |
| parent | 0cc492f81595c28caa24964a105446e362164539 (diff) | |
| download | dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar.gz dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar.bz2 dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar.lz dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar.xz dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.tar.zst dexon-6876e92f8d467dbefd88bbd91df700883ab9c2af.zip | |
Merge remote-tracking branch 'fjl/license-update-1.6'
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -69,7 +69,7 @@ RJ Catalano <rj@erisindustries.com> Nchinda Nchinda <nchinda2@gmail.com> -Aron Fischer <homotopycolimit@users.noreply.github.com> +Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com> Vlad Gluhovsky <gluk256@users.noreply.github.com> @@ -90,3 +90,22 @@ Nick Johnson <arachnid@notdot.net> Henning Diedrich <hd@eonblast.com> Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com> +Felix Lange <fjl@twurst.com> +Felix Lange <fjl@twurst.com> <fjl@users.noreply.github.com> + +Максим Чусовлянов <mchusovlianov@gmail.com> + +Louis Holbrook <dev@holbrook.no> +Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com> + +Thomas Bocek <tom@tomp2p.net> + +Victor Tran <vu.tran54@gmail.com> + +Justin Drake <drakefjustin@gmail.com> + +Frank Wang <eternnoir@gmail.com> + +Gary Rong <garyrong0905@gmail.com> + +Guillaume Nicolas <guin56@gmail.com> |