Commit Graph

3 Commits

Author SHA1 Message Date
Michael Snoyman
87dd80fee0 Updated scaffoldings 2013-04-25 03:14:58 +03:00
Michael Snoyman
98ededba28 Merge remote-tracking branch 'origin/yesod1.2'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/yesod-auth.cabal
	yesod-core/yesod-core.cabal
	yesod-static/Yesod/Static.hs
	yesod-static/yesod-static.cabal
	yesod/yesod.cabal
2013-04-24 19:00:03 +03:00
Michael Snoyman
7cde3d4bdb Put binaries into yesod-bin (fixes #514) 2013-03-20 08:58:27 +02:00