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

Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-24 10:39:36 +10:00

..

_authentication.html.haml

Merge changes

2014-05-14 15:55:18 +10:00

_billing.html.haml

Checkout page design tweaks and improvements to make accordion more usable

2014-07-23 16:57:38 +10:00

_details.html.haml

Checkout page design tweaks and improvements to make accordion more usable

2014-07-23 16:57:38 +10:00

_form.html.haml

Moving payment methods and shipping methods into their own services

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

_order.rabl

Moving payment methods and shipping methods into their own services

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

_payment.html.haml

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

_shipping.html.haml

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

_summary.html.haml

Moving payment methods and shipping methods into their own services

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

edit.html.haml

Merge branch 'master' into working

2014-06-20 12:29:47 +10:00