Merge master into staging-next

2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
    description = "List files recursively";
    license = licenses.mit;
    platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ vika_nezrimaya ];
  };
 }