Merge branch 'master' into ghc821

This commit is contained in:
Michael Snoyman 2017-07-27 14:21:02 +03:00
commit 948cba7aba
No known key found for this signature in database
GPG Key ID: A048E8C057E86876

View File

@ -3236,6 +3236,12 @@ packages:
# https://github.com/fpco/stackage/issues/2661
- servant-docs < 0.11
# https://github.com/fpco/stackage/issues/2663
- doctest < 0.12
# https://github.com/fpco/stackage/issues/2666
- megaparsec < 6.0
# end of packages
# Package flags are applied to individual packages, and override the values of