Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -205,6 +205,6 @@ stdenv.mkDerivation {
      url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
    };
    platforms = builtins.attrNames mozillaPlatforms;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ taku0 ];
  };
 }