Commit Graph

4 Commits

Author SHA1 Message Date
Michael Snoyman
67ae9c739b Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/Yesod/Auth/BrowserId.hs
	yesod-auth/Yesod/Auth/Dummy.hs
	yesod-auth/Yesod/Auth/Email.hs
	yesod-auth/Yesod/Auth/HashDB.hs
	yesod-auth/Yesod/Auth/OpenId.hs
	yesod-auth/Yesod/Auth/Rpxnow.hs
	yesod-form/Yesod/Form/Fields.hs
	yesod-form/Yesod/Form/Functions.hs
	yesod-form/Yesod/Form/Jquery.hs
	yesod-form/Yesod/Form/Nic.hs
	yesod-form/Yesod/Helpers/Crud.hs
	yesod-newsfeed/Yesod/AtomFeed.hs
	yesod-newsfeed/Yesod/RssFeed.hs
2012-03-25 11:07:12 +02:00
Pascal Wittmann
ba1e083edc removed QQ hacks from yesod-form 2012-03-15 21:57:32 +01:00
Michael Snoyman
b5f2e4863d Remove some QQ hacks #288 2012-03-12 08:50:15 +02:00
Michael Snoyman
6f5459f70f Add 'yesod-form/' from commit '53b7c3b81015e7f244c6b8961ca2f07979f932e2'
git-subtree-dir: yesod-form
git-subtree-mainline: 41faf62094
git-subtree-split: 53b7c3b810
2011-07-22 08:59:57 +03:00