Commit Graph

6 Commits

Author SHA1 Message Date
Michael Snoyman
24e8e53f64 Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch
Conflicts:
	.gitignore
	yesod-core/yesod-core.cabal
2014-03-20 04:14:09 +02:00
Greg Weber
5c3078b51e parseJsonBody_ deprecated for requireJsonBody 2014-03-11 18:07:46 -07:00
Michael Snoyman
c19088d569 Switch yesod-core to use simpler dispatch 2014-03-04 13:46:03 +02:00
Michael Snoyman
8ab09931c4 Code cleanup and transformer instances 2013-03-22 09:17:14 +02:00
Michael Snoyman
cf77d86a6a Use new mkParseRouteInstance in yesod-core 2013-03-19 15:17:28 +02:00
Michael Snoyman
2377d70ec8 Merge branch 'master' into yesod1.2
Conflicts:
	yesod-json/yesod-json.cabal
2013-03-10 09:49:28 +02:00