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

Conflicts:
	Stackage/Config.hs
This commit is contained in:
Michael Snoyman 2014-07-17 19:33:16 +03:00
commit 3861f66d27

View file

@ -490,7 +490,7 @@ convertGithubUser x =
fromMaybe [x] $ Map.lookup (map toLower x) pairs fromMaybe [x] $ Map.lookup (map toLower x) pairs
where where
pairs = Map.fromList pairs = Map.fromList
[ ("diagrams", ["diagrams/Core"]) [ ("diagrams", ["byorgey"])
, ("yesodweb", ["snoyberg"]) , ("yesodweb", ["snoyberg"])
, ("fpco", ["snoyberg"]) , ("fpco", ["snoyberg"])
, ("faylang", ["bergmark"]) , ("faylang", ["bergmark"])