Michael Snoyman 6f495fc758 Merge branch 'master' into wai-2.0 ... Conflicts: yesod-static/yesod-static.cabal		2013-11-10 13:46:58 +02:00
..
Core	Merge branch 'master' into wai-2.0	2013-11-10 13:46:58 +02:00
Core.hs	Move some Yesod exports to Yesod.Core	2013-06-06 10:05:22 +03:00