Will Marshall fc02e7857a Merge branch 'master' into laura_and_will ...

Conflicts:
	app/views/shopping_shared/_contact.html.haml

2014-06-04 17:24:30 +10:00

..

_authentication.html.haml

Merge changes

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

_billing.html.haml

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

_details.html.haml

Add class right to icons

2014-05-30 11:56:52 +10:00

_form.html.haml

Final set of regression issues

2014-05-09 16:43:57 +10:00

_order.rabl

Fixing up bugs in the Checkout form

2014-06-04 17:13:18 +10:00

_payment.html.haml

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

_shipping.html.haml

Merge branch 'master' into laura_and_will

2014-06-04 17:24:30 +10:00

_summary.html.haml

Adding icon into button

2014-05-30 12:01:57 +10:00

edit.html.haml

Tweaks for laura, reworking authentication workflow, tidying up checkout

2014-05-09 16:42:51 +10:00