Merge branch 'cherry-pick-a48031e0' into 'releases/3.4'

Merge branch 'fix/change-lastnames' into 'master'

See merge request !2643

.mailmap

@@ -80,13 +80,14 @@ Samuel Scherrer <samuel.scherrer@iws.uni-stuttgart.de> <samuel.scherrer@posteo.d
 
 Shirin Moradi <s.moradi@fz-juelich.de> <moradi@darth.iws.uni-stuttgart.de>
 
-Simon Emmert <simon.emmert@iws.uni-stuttgart.de> <scholz.simon@web.de>
-Simon Emmert <simon.emmert@iws.uni-stuttgart.de> <simon.scholz@iws.uni-stuttgart.de>
+Simon Emmert <simon.emmert@iws.uni-stuttgart.de> Simon Scholz <scholz.simon@web.de>
+Simon Emmert <simon.emmert@iws.uni-stuttgart.de> Simon Scholz <simon.scholz@iws.uni-stuttgart.de>
 
 Sina Ackermann <Sina.Ackermann@gmx.de> <sina.ackermann@iws.uni-stuttgart.de>
 
-Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> <tkurz@kiddo.iws.uni-stuttgart.de>
-Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de>
+Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de>
+Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> Theresa Kurz <tkurz@kiddo.iws.uni-stuttgart.de>
+Theresa Schollenberger <theresa.schollenberger@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de>
 
 Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de>
 

LICENSE.md

@@ -38,7 +38,7 @@ Copyright holders
 | 2020-2021  | Tim Jupe                   |
 | 2020-2021  | Mathis Kelm                |
 | 2017       | Kata Kurgyis               |
-| 2018-2021  | Theresa Kurz               |
+| 2018-2021  | Theresa Schollenberger     |
 | 2008-2012  | Andreas Lauser             |
 | 2018       | Giuliano Lombardo          |
 | 2018-2021  | Melanie Lipp               |