Merge master into staging-next

2021-05-12 18:32:26 +00:00
parent a18880bf72 3d67a797b7
commit f214722172
17 changed files with 157 additions and 46 deletions
@@ -6380,6 +6380,12 @@
      fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94";
    }];
  };
+  mdsp = {
+    github = "Mdsp9070";
+    githubId = 44469426;
+    name = "Matheus de Souza Pessanha";
+    email = "matheus_pessanha2001@outlook.com";
+  };
  meatcar = {
    email = "nixpkgs@denys.me";
    github = "meatcar";