Michael Snoyman 699d76d13a Merge branch 'beta' ... Conflicts: yesod-core/yesod-core.cabal yesod-json/yesod-json.cabal yesod-test/Yesod/Test.hs yesod-test/test/main.hs yesod-test/yesod-test.cabal		2012-07-11 08:48:09 +03:00
..
BrowserId.hs	$newline	2012-07-01 20:59:37 +03:00
Dummy.hs	$newline	2012-07-01 20:59:37 +03:00
Email.hs	$newline	2012-07-01 20:59:37 +03:00
GoogleEmail.hs	$newline	2012-07-01 20:59:37 +03:00
HashDB.hs	$newline	2012-07-01 20:59:37 +03:00
Message.hs	Merge branch 'master' of https://github.com/tanakh/yesod	2012-06-05 06:22:31 +03:00
OpenId.hs	Allow openid to use claimed IDs (#338)	2012-07-02 09:57:20 +03:00
Rpxnow.hs	$newline	2012-07-01 20:59:37 +03:00