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

..

_fat.html.haml

Added bindonce and ng-if improvements to Producers templates

2015-05-03 12:51:59 +10:00

_filters.html.haml

Hiding filters on list views because styling is broken

2015-04-24 19:35:18 +10:00

_skinny.html.haml

Added bindonce and ng-if improvements to Producers templates

2015-05-03 12:51:59 +10:00

index.html.haml

Remove clashing padding classes

2015-05-04 23:02:33 +10:00

signup.html.haml

Style shops signup page

2015-05-12 13:51:31 +10:00