Maikel Linke b641de6ec9 Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages ...

Conflicts:
	app/views/groups/show.html.haml

2015-02-05 15:52:00 +11:00

..

_contact.html.haml

moving contact partial and giving example code

2015-02-05 15:50:33 +11:00

index.html.haml

Add padding to groups homepage

2015-01-29 15:52:40 +11:00

show.html.haml

Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages

2015-02-05 15:52:00 +11:00