Merge remote-tracking branch 'origin/master' into yesod-1.4

Browse Source

Conflicts:
	yesod-persistent/test/Yesod/PersistSpec.hs

...

This commit is contained in:

Michael Snoyman 2014-09-29 08:17:54 +03:00

parent 3447510080 963bdbfdcd

commit d98061408a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available