diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:29:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:36:54 +0100 |
| commit | 7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e (patch) | |
| tree | addea6c250c34b29acb432fd2602b58922771868 /lib/maintainers.nix | |
| parent | 1743953cc5dee3ec78d1769ec5edff18a27607cb (diff) | |
| parent | 9ae72f2715d800f25f7dca0dec69624968d52909 (diff) | |
| download | nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.gz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.bz2 nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.lz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.xz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.zst nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.zip | |
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting after qt4 timing out for the first time: https://hydra.nixos.org/eval/1412641?compare=1412561
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 d798d6d315b5..0baf98a0422c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -208,6 +208,7 @@ eqyiel = "Ruben Maher <r@rkm.id.au>"; ericbmerritt = "Eric Merritt <eric@afiniate.com>"; ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>"; + ericson2314 = "John Ericson <John.Ericson@Obsidian.Systems>"; erictapen = "Justin Humm <justin.humm@posteo.de>"; erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>"; ertes = "Ertugrul Söylemez <esz@posteo.de>"; |