Merge branch 'patch-1' of https://github.com/joeyh/stackage into joeyh-patch-1
Conflicts:
build-constraints.yaml
commitce3bb90d4cc97a4a908c0b2e23e2aea5b71f405d
authorMichael Snoyman <michael@snoyman.com>
dateTue 19 May 2015, 17:06 (11 years ago)
parente575cf8906f14e
build-constraints.yaml+3
@@ -525,6 +525,9 @@ packages:
525525 - DAV
526526 #- hopenpgp-tools GHC 7.10, via syb-with-class
527527
528+ "Joey Hess <id@joeyh.name>":
529+ - git-annex
530+
528531 # https://github.com/fpco/stackage/issues/160
529532 "Ketil Malde":
530533 - biocore