diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-28 18:30:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 18:30:04 +0000 |
| commit | 7fb7a6299060eef33643b9559e4d390b6e582511 (patch) | |
| tree | 2a188f06f9e42392e4ae23c68bd333f8f52efac4 /maintainers | |
| parent | 2e6c34fd11a81b4e3ef73df28a1b4b605a51e776 (diff) | |
| parent | 908107293301fa12a86111a5aa39c01b775f58b4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f25f11f57aec..bda18bd0a5aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5640,6 +5640,12 @@ email = "markus@wotringer.de"; name = "Markus Wotringer"; }; + marijanp = { + name = "Marijan Petričević"; + email = "marijan.petricevic94@gmail.com"; + github = "marijanp"; + githubId = 13599169; + }; marius851000 = { email = "mariusdavid@laposte.net"; name = "Marius David"; @@ -8649,6 +8655,12 @@ githubId = 36899624; name = "squalus"; }; + srapenne = { + email = "solene@perso.pw"; + github = "rapenne-s"; + githubId = 248016; + name = "Solène Rapenne"; + }; srghma = { email = "srghma@gmail.com"; github = "srghma"; |