Merge branch 'master' into ghc7.10

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-05-03 18:37:13 +03:00
commit 99eec0a270

View File

@ -1290,9 +1290,6 @@ expected-test-failures:
# https://github.com/ekmett/linear/issues/75 GHC 7.10
- linear
# https://github.com/yesodweb/Shelly.hs/issues/99
- shelly
# Haddocks which are expected to fail. Same concept as expected test failures.
expected-haddock-failures:
# https://github.com/acw/bytestring-progress/issues/4