Merge pull request #1256 from GLolol/mailmap

mailmap: update my emails
This commit is contained in:
Valentin Lorentz 2016-08-05 19:57:40 +02:00 committed by GitHub
commit fbbc806def

View File

@ -13,7 +13,9 @@
<shadowninja@minetest.net> <ShadowNinja@users.noreply.github.com>
Daniel Folkinshteyn <nanotube@users.sourceforge.net> Daniel F <dfolkins@a90.(none)>
Daniel Folkinshteyn <nanotube@users.sourceforge.net> nanotube <nanotube@users.sf.net>
James Lu <glolol1@hotmail.com> <GLolol1@hotmail.com>
James Lu <GLolol@overdrivenetworks.com> <GLolol1@hotmail.com>
James Lu <GLolol@overdrivenetworks.com> <glolol1@hotmail.com>
James Lu <GLolol@overdrivenetworks.com> <glolol@overdrive.pw>
James McCoy <jamessan@users.sourceforge.net>
Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mika.henrik.mainio@hotmail.com>
Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mkaysi@outlook.com>