Skip to content
Snippets Groups Projects
Commit 42a96fe9 authored by Leon Keim's avatar Leon Keim
Browse files

Merge branch 'authors-release-3-9' into 'master'


Authors release 3 9

See merge request !224

(cherry picked from commit 0415dd18)

ca6197cf Update AUTHORS.md
2a5da45e Update README.md gpl 2 to 3
b8110bb9 Update README.md change to newer link for gpl

Co-authored-by: default avatarLeon Keim <leon.keim@googlemail.com>
parent 236512cb
No related branches found
No related tags found
1 merge request!225Merge branch 'authors-release-3-9' into 'master'
Pipeline #46505 passed
...@@ -5,8 +5,8 @@ The DuMux Lecture contributors are ...@@ -5,8 +5,8 @@ The DuMux Lecture contributors are
| 2017-2018 | Sina Ackermann | | 2017-2018 | Sina Ackermann |
| 2008-2012 | Katherina Baber | | 2008-2012 | Katherina Baber |
| 2015 | Martin Beck | | 2015 | Martin Beck |
| 2022-2023 | Ivan Buntic | | 2022-2024 | Ivan Buntic |
| 2012-2021, 2023 | Holger Class | | 2012-2021, 2023-2024 | Holger Class |
| 2018-2021 | Edward 'Ned' Coltman | | 2018-2021 | Edward 'Ned' Coltman |
| 2012-2013 | Melanie Darcis | | 2012-2013 | Melanie Darcis |
| 2018-2020 | Simon Emmert | | 2018-2020 | Simon Emmert |
...@@ -17,10 +17,11 @@ The DuMux Lecture contributors are ...@@ -17,10 +17,11 @@ The DuMux Lecture contributors are
| 2016-2020, 2022 | Katharina Heck | | 2016-2020, 2022 | Katharina Heck |
| 2015-2016, 2019 | Johannes Hommel | | 2015-2016, 2019 | Johannes Hommel |
| 2012 | Johannes Irtenkauf | | 2012 | Johannes Irtenkauf |
| 2020, 2022-2023 | Mathis Kelm | | 2024 | Leon Keim |
| 2020, 2022-2024 | Mathis Kelm |
| 2021-2022 | Stefanie Kiemle | | 2021-2022 | Stefanie Kiemle |
| 2014 | Alexander Kissinger | | 2014 | Alexander Kissinger |
| 2015-2023 | Timo Koch | | 2015-2024 | Timo Koch |
| 2018 | Melanie Lipp | | 2018 | Melanie Lipp |
| 2011 | Andreas Lauser | | 2011 | Andreas Lauser |
| 2023 | Hamza Oukili | | 2023 | Hamza Oukili |
...@@ -29,9 +30,9 @@ The DuMux Lecture contributors are ...@@ -29,9 +30,9 @@ The DuMux Lecture contributors are
| 2018-2020, 2022 | Theresa Schollenberger | | 2018-2020, 2022 | Theresa Schollenberger |
| 2012-2015 | Nicolas Schwenck | | 2012-2015 | Nicolas Schwenck |
| 2018 | Gabriele Seitz | | 2018 | Gabriele Seitz |
| 2020 | Maziar Veyskarami | | 2020,2024 | Maziar Veyskarami |
| 2012-2014 | Lena Walter | | 2012-2014 | Lena Walter |
| 2022 | Yue Wang | | 2022, 2024 | Yue Wang |
| 2020 | Felix Weinhardt | | 2020 | Felix Weinhardt |
| 2015-2020 | Kilian Weishaupt | | 2015-2020 | Kilian Weishaupt |
| 2018 | Kai Wendel | | 2018 | Kai Wendel |
......
...@@ -23,7 +23,7 @@ License ...@@ -23,7 +23,7 @@ License
------- -------
DuMuX-Lecture is licensed under the terms and conditions of the GNU DuMuX-Lecture is licensed under the terms and conditions of the GNU
General Public License (GPL) version 2 or - at your option - any later General Public License (GPL) version 3 or - at your option - any later
version. The [GPL can be read online][2], or in the `LICENSE.md` file version. The [GPL can be read online][2], or in the `LICENSE.md` file
provided in the topmost directory of the DuMuX source code tree. provided in the topmost directory of the DuMuX source code tree.
...@@ -52,4 +52,4 @@ make -j8 build_tests && ctest -j8 ...@@ -52,4 +52,4 @@ make -j8 build_tests && ctest -j8
[0]: http://dumux.org [0]: http://dumux.org
[1]: http://www.hydrosys.uni-stuttgart.de/index.en.php [1]: http://www.hydrosys.uni-stuttgart.de/index.en.php
[2]: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html [2]: https://www.gnu.org/licenses/gpl-3.0.en.html
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment