Skip to content

Commit

Permalink
Merge branch 'authors' into 'master'
Browse files Browse the repository at this point in the history
Update authors in .cff-file.

Closes #3304

See merge request ogs/ogs!4765
  • Loading branch information
bilke committed Oct 17, 2023
2 parents b78fa53 + 75a44dc commit 30038da
Show file tree
Hide file tree
Showing 2 changed files with 210 additions and 129 deletions.
17 changes: 12 additions & 5 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Alireza Hassanzadegan <[email protected]> AlirezaBGE <a.hassanzadegan@gm
Aqeel Chaudhry <[email protected]> aachaudhry <[email protected]>
Carolin Helbig <[email protected]>
Chaofan Chen <[email protected]>
Chaofan Chen <[email protected]> <[email protected]>
Christian Silbermann <[email protected]> cbsilver <[email protected]>
Christoph Lehmann <[email protected]> <[email protected]>
Dmitri Naumov <[email protected]> <[email protected]>
Expand All @@ -27,29 +28,33 @@ Jörg Buchwald <[email protected]> joerg <joerg@debian>
Jörg Buchwald <[email protected]> joergbuchwald <[email protected]>
Jörg Buchwald <[email protected]> joergbuchwald <[email protected]>
Karsten Rink <[email protected]>
Keita Yoshioka <[email protected]> KeitaYoshioka <[email protected]>
Keita Yoshioka <[email protected]>
Keita Yoshioka <[email protected]> <[email protected]>
Lars Bilke <[email protected]> <[email protected]> <[email protected]>
Lars Bilke <[email protected]> Lars Bilke <[email protected]>
Lars Bilke <[email protected]> Lars Bilke <[email protected]>
Marc Walther <[email protected]>
Mostafa Mollaali <[email protected]> MostafaMollaali <[email protected]>
Myles English <[email protected]>
Norbert Grunwald <[email protected]> <[email protected]> <[email protected]>
Norihiro Watanabe <[email protected]> <[email protected]> <[email protected]>
Norbert Grunwald <[email protected]> <[email protected]>
Norbert Grunwald <[email protected]> <[email protected]>
Norihiro Watanabe <[email protected]> <[email protected]>
Norihiro Watanabe <[email protected]> <[email protected]>
OGS Bot[bot] <no-email> git@dev2 <[email protected]>
OGS Bot[bot] <no-email> GitLab Runner <[email protected]>
OGS Bot[bot] <no-email> OGS Bot <[email protected]>
OGS Bot[bot] <no-email> OGS Bot <[email protected]>
OGS Bot[bot] <no-email> ogsbot <[email protected]>
Renchao Lu <[email protected]> <[email protected]> <[email protected]>
Renchao Lu <[email protected]> <[email protected]>
Renchao Lu <[email protected]> <[email protected]>
Renchao Lu <[email protected]> renchao.lu <[email protected]>
Reza Taher Dang Koo <[email protected]> rezataherdangkoo <[email protected]>
Shuang Chen <[email protected]> <[email protected]>
Shuang Chen <[email protected]> Shuang Chen <[email protected]>
Tengfei Deng <[email protected]> tengfeideng <[email protected]>
Tengfei Deng <[email protected]> tengfeideng <[email protected]>
Thomas Fischer <[email protected]> <[email protected]> <[email protected]>
Thomas Fischer <[email protected]>
Thomas Fischer <[email protected]> <[email protected]>
Thomas Kalbacher <[email protected]> Thomas-TK <[email protected]>
Thomas Nagel <[email protected]> <[email protected]>
Thomas Nagel <[email protected]> nagelt <[email protected]>
Expand Down Expand Up @@ -85,3 +90,5 @@ Julian Heinze <[email protected]>
Tao You <[email protected]>
Matthes Kantzenbach <[email protected]>
Feliks K. Kiszkurno <[email protected]>
Philipp Selzer <[email protected]>
Philipp Selzer <[email protected]> <[email protected]>
Loading

0 comments on commit 30038da

Please sign in to comment.