Merge branch 'master' into fix/roundcube

2019-11-19 13:16:16 -08:00
parent d7982b7382 943508a7fa
commit 4c18309ca6
3104 changed files with 83704 additions and 86046 deletions
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
  name = "roundcube";
  meta = with pkgs.stdenv.lib.maintainers; {
    maintainers = [ globin ];