Merge master into staging-next

2021-05-16 18:32:41 +00:00
parent 684991c696 805825cc52
commit 8c6d819143
40 changed files with 156 additions and 139 deletions
@@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
      large intranets by maximizing existing and available bandwidth.
    '';
    license = licenses.asl20;
-    maintainers = with maintainers; [ midchildan joaquinito2051 ];
+    maintainers = with maintainers; [ midchildan ];
    platforms = platforms.unix;
  };
 }