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

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-05-11 12:45:54 +03:00
commit 2a0621d8c2

View File

@ -183,6 +183,7 @@ packages:
- hakyll
- stylish-haskell
- psqueues
- websockets
"Antoine Latter":
- byteorder