Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-06-09 05:58:59 +03:00
commit 702e2bf94a

View File

@ -940,6 +940,9 @@ packages:
"Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
- setlocale
"John Chee <cheecheeo+stackage@gmail.com> @chee1bot":
- cgi
"Taylor Fausak <taylor@fausak.me> @tfausak":
- flow
@ -1009,7 +1012,7 @@ packages:
"Michael Thompson <what_is_it_to_do_anything@yahoo.com> @michaelt":
- pipes-text
"Justin Le <justin@jle.im> @mstksg":
- auto
- tagged-binary
@ -1026,7 +1029,7 @@ packages:
- serf
- uri-templater
- librato
"Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
# https://github.com/MichaelXavier/Angel/issues/41
# - angel