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

..

_cart.html.haml

Working bindings

2014-07-18 16:05:58 +10:00

_large_menu.html.haml

Major refactoring

2014-06-20 16:31:49 +10:00

_menu.html.haml

Moving OFN flash to fixed block

2014-06-10 12:29:31 +10:00

_mobile_menu.html.haml

Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things

2014-07-23 15:35:44 +10:00