Commit Graph

4 Commits

Author SHA1 Message Date
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
Michael Snoyman
a5b4dd5d29 atom:author (#351) 2012-07-02 09:46:35 +03:00
Michael Snoyman
e99a852cfb Fix a typo 2012-06-05 06:14:45 +03:00
Michael Snoyman
894336a482 Add 'yesod-newsfeed/' from commit 'e68851b9db97519e0cade5dc10bb964c270b4a9a'
git-subtree-dir: yesod-newsfeed
git-subtree-mainline: 83813b1df4
git-subtree-split: e68851b9db
2011-07-22 08:59:57 +03:00