Merge remote-tracking branch 'upstream/master' into HEAD

2017-09-02 23:29:04 +02:00
parent 891a1662aa d784b83005
commit 0156db2da5
4456 changed files with 84812 additions and 61072 deletions
@@ -251,7 +251,7 @@ in

      substituteInPlace lib/sup/crypto.rb \
        --replace 'which gpg2' \
-                  '${which}/bin/which gpg2'
+                  '${which}/bin/which gpg'
    '';
  };