diff options
| author | Perry Barnoy <pjbarnoy@gmail.com> | 2015-10-14 16:26:40 -0400 |
|---|---|---|
| committer | Perry Barnoy <pjbarnoy@gmail.com> | 2015-10-14 16:26:40 -0400 |
| commit | 3d087ed3b1745a591bf54bbef847b9902961e625 (patch) | |
| tree | b527995b71a8e1ce660fb46a60714edf77836bbf /lib/maintainers.nix | |
| parent | 79321fbecdf9c20c83f2275a8162455ceda2159e (diff) | |
| parent | 66fc345cbaa8486f7f16f800dbae337fa8d0bd11 (diff) | |
| download | nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar.gz nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar.bz2 nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar.lz nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar.xz nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.tar.zst nixlib-3d087ed3b1745a591bf54bbef847b9902961e625.zip | |
Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin
Merge upstream.
Diffstat (limited to 'lib/maintainers.nix')
| -rw-r--r-- | lib/maintainers.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ce9e8f39d66b..fc7f368b676a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -81,6 +81,7 @@ dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>"; dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>"; dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>"; + dochang = "Desmond O. Chang <dochang@gmail.com>"; doublec = "Chris Double <chris.double@double.co.nz>"; ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; @@ -101,6 +102,7 @@ fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>"; forkk = "Andrew Okin <forkk@forkk.net>"; fpletz = "Franz Pletz <fpletz@fnordicwalking.de>"; + fps = "Florian Paul Schmidt <mista.tapas@gmx.net>"; fridh = "Frederik Rietdijk <fridh@fridh.nl>"; fro_ozen = "fro_ozen <fro_ozen@gmx.de>"; ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>"; |