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

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-03-30 17:54:07 +03:00
commit 6c83fe123d

View File

@ -536,6 +536,7 @@ packages:
"Simon Michael <simon@joyful.com>":
- hledger
- shelltestrunner
- hledger-web
"Mihai Maruseac <mihai.maruseac@gmail.com>":
- io-manager