Will Marshall edaba844d9 Merge branch 'laura_and_will' into new_cart ...

Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-18 17:02:19 +10:00

..

_auth_token_script.html.haml

Ensure that AUTH_TOKEN var is set in tests, since spree's admin JS errors without it

2012-11-21 11:49:59 +11:00

_become_distributor.html.haml

No change

2014-06-03 11:18:43 +10:00

_become_farmer.html.haml

Added modal placeholders for new distributors and farmers sections.

2013-08-13 15:20:21 +10:00

_bugherd_script.html.haml

gs

2014-04-03 10:34:03 +13:00

_cms_nav_spree.html.haml

Create links between Spree and CMS admin sections

2012-10-11 12:50:59 +11:00

application.html.erb

Display CMS pages with Spree's layout

2012-10-12 10:21:21 +11:00

darkswarm.html.haml

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00