Merge branch 'master' of github.com:fpco/stackage

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-10-13 08:14:36 +00:00
commit f6619634b9

View File

@ -1529,6 +1529,10 @@ packages:
"Robbin C. <robbinch33@gmail.com>":
- zim-parser
"David Wiltshire <david.wiltshire@metark.com> @dave77":
# on behalf of Alexey Karakulov @w3rs
- hashable-time
"Stackage upper bounds":
# https://github.com/fpco/stackage/issues/537
- zlib < 0.6