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
..
Static.hs	Merge remote-tracking branch 'origin/yesod1.2'	2013-04-24 19:00:03 +03:00