2 Commits

Author	SHA1	Message	Date
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