Merge branch 'master' into pr/accumulate-allow
commit35181170b76828ef4ea51a05cf0523a1129a89fb
authorHerbert Valerio Riedel <hvr@gnu.org>
Thu, 10 Aug 2017 07:11:44 +0000 (10 09:11 +0200)
committerGitHub <noreply@github.com>
Thu, 10 Aug 2017 07:11:44 +0000 (10 09:11 +0200)
tree41c9ace7033d605501f98604e921a1e007a7b811
parent96a8051ab091d90bfcef46c2963bb071f5c3f4ca
parent6a0885004a79ce9c6a2fbacaf253bddec423eb8e
Merge branch 'master' into pr/accumulate-allow
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
cabal-install/changelog