Commit 565ddbff authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'b-mailmap' into 'v3.1-stable' 

[v3.1-stable] Fixes to Mailmap

See merge request allpix-squared/allpix-squared!1137
parents e0191d66 d4a33653

.mailmap

+5 −1
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ Andy Wharton <AndyWharton1976@gmail.com> 
Annika Vauth <annika.vauth@desy.de> <annika.vauth@uni-hamburg.de>

Annika Vauth <annika.vauth@desy.de> av <nika@little-black-box>

Arka Santra <santra.arka@gmail.com>

Ben Bruers <ben.brueers@cern.ch>

Carsten Daniel Burgard <carsten.burgard@cern.ch> <cburgard@cern.ch>

Daniel Hynds <daniel.hynds@cern.ch>

Daniil Rastorguev <daniil.rastorguev@desy.de>

Daniil Rastorguev <daniil.rastorguev@desy.de> drastorg <daniil.rastorguev@cern.ch>

Daniil Rastorguev <daniil.rastorguev@desy.de> dannrastor <dannraptor@gmail.com>

Edoardo Rossi <edrossi@cern.ch> <edrossi@lxplus024.cern.ch>

Edoardo Rossi <edrossi@cern.ch> <edrossi@lxplus068.cern.ch>

Edoardo Rossi <edrossi@cern.ch> <edrossi@lxplus082.cern.ch>
@@ -52,6 +54,7 @@ Petr Smolyanskiy <petr.smolyanskiy@utef.cvut.cz> 
Radek Privara <radek.privara@cern.ch> <rprivr@gmail.com>

Rafaella Eleni Kotitsa <rafaella.eleni.kotitsa@cern.ch> <rkotitsa@rkotitsa.home>

Reem Hani M Taibah <reem.hani.m.taibah@cern.ch> <reem.h.m.taibah@cern.ch>

Ryan Heller <rheller@lbl.gov> heller3 <heller3@gmail.com>

Ryuji Moriya <rmoriya@cern.ch> <rmoriya@lxplus709.cern.ch>

Ryuji Moriya <rmoriya@cern.ch> <rmoriya@lxplus7107.cern.ch>

Ryuji Moriya <rmoriya@cern.ch> <rmoriya@lxplus7112.cern.ch>
@@ -79,3 +82,4 @@ Thomas Billoud <thomas.billoud@cern.ch> Thomas Remy Victor Billoud <tbilloud@lxp 
Thomas Billoud <thomas.billoud@cern.ch> Thomas <thomas.billoud@cern.ch>

Tobias Bisanz <tobias.bisanz@cern.ch> <tobias.bisanz@phys.uni-goettingen.de>

Viktor Sonesten <tmplt@dragons.rocks>

Yajun He <yajun.he@cern.ch> yajun <yajun.he@cern.ch>