Merge staging-next into staging

2021-04-30 18:26:34 +00:00
parent 17305d2df0 28b0400c8e
commit 20ebbe6b59
37 changed files with 594 additions and 116 deletions
@@ -3991,6 +3991,16 @@
    githubId = 19825977;
    name = "Hiren Shah";
  };
+  hiro98 = {
+    email = "hiro@protagon.space";
+    github = "vale981";
+    githubId = 4025991;
+    name = "Valentin Boettcher";
+    keys = [{
+      longkeyid = "rsa2048/0xC22D4DE4D7B32D19";
+      fingerprint = "45A9 9917 578C D629 9F5F  B5B4 C22D 4DE4 D7B3 2D19";
+    }];
+  };
  hjones2199 = {
    email = "hjones2199@gmail.com";
    github = "hjones2199";
@@ -7031,6 +7041,12 @@
    githubId = 628342;
    name = "Tim Steinbach";
  };
+  netcrns = {
+    email = "jason.wing@gmx.de";
+    github = "netcrns";
+    githubId = 34162313;
+    name = "Jason Wing";
+  };
  netixx = {
    email = "dev.espinetfrancois@gmail.com";
    github = "netixx";