Merge branch 'master' into nightly

This commit is contained in:
Chris Dornan 2017-05-20 15:03:25 +01:00
commit 8e3c40f98d

View File

@ -3179,6 +3179,9 @@ packages:
# https://github.com/fpco/stackage/issues/2365 # https://github.com/fpco/stackage/issues/2365
- matplotlib < 0.4.1 # still an issue with 0.4.5 - matplotlib < 0.4.1 # still an issue with 0.4.5
# https://github.com/fpco/stackage/issues/2528
- concurrent-output < 1.10.0
# end of packages # end of packages
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of