Merge branch 'patch-1' of https://github.com/joeyh/stackage into joeyh-patch-1

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-05-19 17:06:51 +03:00
commit ce3bb90d4c

View File

@ -525,6 +525,9 @@ packages:
- DAV
#- hopenpgp-tools GHC 7.10, via syb-with-class
"Joey Hess <id@joeyh.name>":
- git-annex
# https://github.com/fpco/stackage/issues/160
"Ketil Malde":
- biocore