about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-07-21 20:08:44 +0200
committerGitHub <noreply@github.com>2020-07-21 20:08:44 +0200
commit9a47c3b5048991b1b4f5307c572717643a3f7dec (patch)
tree0b31fd3e6525633583ba39176d2f2f732eb2b731 /maintainers
parent225628ff02cb4391db583cd6a82fb3f9026aa9ac (diff)
parent7937ba3e8970c923510a95d0fba6401051491f67 (diff)
downloadnixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar.gz
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar.bz2
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar.lz
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar.xz
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.tar.zst
nixlib-9a47c3b5048991b1b4f5307c572717643a3f7dec.zip
Merge pull request #93558 from galagora/update-android-studio
androidStudioPackages.beta: 4.0.0.16 -> 4.1.0.14
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4d2f558f8905..4a10f51c20e7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2928,6 +2928,12 @@
     githubId = 7047019;
     name = "Florent Becker";
   };
+  galagora = {
+    email = "lightningstrikeiv@gmail.com";
+    github = "galagora";
+    githubId = 45048741;
+    name = "Alwanga Oyango";
+  };
   gamb = {
     email = "adam.gamble@pm.me";
     github = "gamb";
@@ -5197,6 +5203,12 @@
     github = "metadark";
     githubId = 382041;
   };
+  meutraa = {
+    email = "paul+nixpkgs@lost.host";
+    name = "Paul Meredith";
+    github = "meutraa";
+    githubId = 68550871;
+  };
   mfossen = {
     email = "msfossen@gmail.com";
     github = "mfossen";