diff options
author | Roman Naumann <namor@hemio.de> | 2016-12-29 14:02:52 +0100 |
---|---|---|
committer | Roman Naumann <namor@hemio.de> | 2016-12-29 14:02:52 +0100 |
commit | 87ef766f6b1718136ec851237856d6f9fc578ccf (patch) | |
tree | c1a2214867019e97f6b0623592c9d71995bd5be9 /lib/maintainers.nix | |
parent | 004eceb0f6c405515bc229c190d0da287fb51d94 (diff) | |
parent | 774435d0aa2c5e0cddb11a553ec1b1eaef748ed5 (diff) | |
download | nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.gz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.bz2 nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.lz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.xz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.zst nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.zip |
Merge branch 'master' of github.com:nixos/nixpkgs into add_pkg_gorilla
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 775afaae1fb2..a15800d177b9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -333,6 +333,7 @@ ocharles = "Oliver Charles <ollie@ocharles.org.uk>"; odi = "Oliver Dunkl <oliver.dunkl@gmail.com>"; offline = "Jaka Hudoklin <jakahudoklin@gmail.com>"; + oida = "oida <oida@posteo.de>"; okasu = "Okasu <oka.sux@gmail.com>"; olcai = "Erik Timan <dev@timan.info>"; olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>"; |