Merge remote-tracking branch 'upstream/master'

This commit is contained in:
AndrewRademacher 2017-09-23 15:19:01 -05:00
commit 793926ab17

View File

@ -3382,9 +3382,6 @@ packages:
# https://github.com/fpco/stackage/issues/2860
- language-c < 0.7
# https://github.com/fpco/stackage/issues/2861
- swagger2 < 2.1.5
# https://github.com/fpco/stackage/issues/2878
- hackage-db < 2.0