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

..

products

Merge branch 'master' into laura_and_will

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

products.rabl

Only rendering images if they exist

2014-05-28 16:03:42 +10:00

show.html.haml

Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.

2014-05-29 16:42:05 +10:00