Rohan Mitchell eac22df200 Merge branch 'master' into redesign ...

Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml

2015-05-13 09:53:20 +10:00

..

products

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

_messages.html.haml

Changing shopfront message into an alert box

2014-12-19 14:04:02 +11:00