diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
| commit | 9548028a22f3fbc44a450d5ccedaa722479a23ec (patch) | |
| tree | 4e405124ab321c69cd9997348fc4fec54540c1a2 /lib/maintainers.nix | |
| parent | c08e4b9102f1b1bd7cd23cc84c61292f1f45aa7e (diff) | |
| parent | da82aff2b05c684cc8239627b54a30002281e35b (diff) | |
| download | nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.gz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.bz2 nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.lz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.xz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.zst nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/os-specific/linux/cpupower/default.nix
Diffstat (limited to 'lib/maintainers.nix')
| -rw-r--r-- | lib/maintainers.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9ff2d53b4668..d2c62ef9bb8f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -258,6 +258,7 @@ gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; geistesk = "Alvar Penning <post@0x21.biz>"; + genesis = "Ronan Bignaux <ronan@aimao.org>"; georgewhewell = "George Whewell <georgerw@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; |