summerscope 15cde6c372 Merge branch 'laura_and_will' into icon_font ...

Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml

2014-05-30 12:12:07 +10:00

..

_food_hub.html.haml

Kill whitespace around icon

2014-05-29 11:47:06 +10:00

_groups.html.haml

Add groups icon to modal

2014-05-29 11:08:35 +10:00

_learn_more.html.haml

Fixing my modal and the tests

2014-05-20 12:18:28 +10:00

_producer.html.haml

Patching a couple of minor regressions

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

_producers.html.haml

Add producers icon to modal

2014-05-29 11:05:28 +10:00

_product.html.haml

Merge branch 'master' into fixing_modals

2014-05-29 11:14:16 +10:00