Merge branch 'master' of heroku.com:growstuff-payments into redesign-homepage

Browse Source

Conflicts:
	app/models/crop.rb

...

This commit is contained in:

Skud committed 2013-08-19 19:28:31 +10:00

2 parents ccd0f9c46a a485778c06

commit 20171942d8

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

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

Diff Content Not Available