diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /maintainers | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
| download | nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2 nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ff47c76fd05..8f3a692b6844 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1570,6 +1570,11 @@ github = "endgame"; name = "Jack Kelly"; }; + enorris = { + name = "Eric Norris"; + email = "erictnorris@gmail.com"; + github = "ericnorris"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; @@ -2623,6 +2628,11 @@ github = "kierdavis"; name = "Kier Davis"; }; + killercup = { + email = "killercup@gmail.com"; + github = "killercup"; + name = "Pascal Hertleif"; + }; kiloreux = { email = "kiloreux@gmail.com"; github = "kiloreux"; |