summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-12-31 13:29:32 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-12-31 13:29:32 +0100
commite823016e6664d6ee1e0a8f7cfe419f32b43bc9dc (patch)
treef5a0baefbf2bf78f4cd6775eacb70fc4e1da0370 /maintainers
parentf6514239ee9b0739a6e884ba28e9302c0102f8c0 (diff)
parentb4b338eedc4faa4c9ef3120783634664e2347c48 (diff)
Merge master into staging-next
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 5ce46ff64365d..ef99c09d3c48d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3693,6 +3693,12 @@
     githubId = 2789926;
     name = "Imran Hossain";
   };
+  iammrinal0 = {
+    email = "nixpkgs@mrinalpurohit.in";
+    github = "iammrinal0";
+    githubId = 890062;
+    name = "Mrinal";
+  };
   iand675 = {
     email = "ian@iankduncan.com";
     github = "iand675";
@@ -6699,6 +6705,12 @@
     githubId = 111265;
     name = "Ozan Sener";
   };
+  otavio = {
+    email = "otavio.salvador@ossystems.com.br";
+    github = "otavio";
+    githubId = 25278;
+    name = "Otavio Salvador";
+  };
   otwieracz = {
     email = "slawek@otwiera.cz";
     github = "otwieracz";