Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
@@ -22,6 +22,6 @@ in buildEnv {
       ++ [ "${git}/share/gitweb" ];

  meta = git.meta // {
-    maintainers = with lib.maintainers; [ gnidorah ];
+    maintainers = with lib.maintainers; [ ];
  };
 }