Merge branch 'master' into gb/speed-cache-reading
commit3015bbdeecd2496b3a6e0457c6044d1fab89fd32
authorgbaz <gershomb@gmail.com>
Sun, 8 Aug 2021 19:03:24 +0000 (8 15:03 -0400)
committerGitHub <noreply@github.com>
Sun, 8 Aug 2021 19:03:24 +0000 (8 15:03 -0400)
tree3e3d9ac9c5f39170e57de90e246bc89d54099631
parentc1d5d4ffdc8febfde0c6d38d7b8d831a60df8a5b
parenta8d47c3c71767414add8177b538f1783528f5cd6
Merge branch 'master' into gb/speed-cache-reading
cabal-install/src/Distribution/Client/FileMonitor.hs