Rohan Mitchell 83e3c6815d Merge branch 'checkout-changes' ...

Conflicts:
	.rvmrc
	app/helpers/application_helper.rb

2013-01-22 10:30:51 +11:00

..

assets

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

open_food_web

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

spree

Refactor libs to use enterprise instead of supplier and distributor

2012-10-29 14:57:03 +11:00

tasks

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00