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

..

_about.html.haml

Restoring the image

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

_contact.html.haml

Merge branch 'master' into laura_and_will

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

_details.html.haml

Hiding image if not present

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

_groups.html.haml

Styling and layout for groups tab content

2014-05-30 15:54:42 +10:00

_last_order_cycle.html.haml

Renaming our partials

2014-05-02 14:47:12 +10:00

_next_order_cycle.html.haml

Renaming our partials

2014-05-02 14:47:12 +10:00

_order_cycles.html.haml

Do not fetch products JSON on every shopping page

2014-05-29 10:54:08 +10:00

_producers.html.haml

Refactor producers tab content for spacing of string

2014-05-30 16:02:46 +10:00

_tabs.html.haml

Tabs styling for hub shopfront page

2014-05-30 15:56:40 +10:00