Rafael Schouten 62f7114fa1 Merge branch 'cleanup' into migrate_ent_types ...

Conflicts:
	app/views/home/_hubs.html.haml

2014-10-02 10:02:08 +10:00

..

_fat.html.haml

Short description goes back in producer fat view until we can clean up the HTML formatting

2014-09-12 15:40:12 +10:00

_filters.html.haml

Merge branch 'master' into cleanup

2014-09-25 19:42:20 +10:00

_skinny.html.haml

merge has_shopfront and is_distibutor

2014-10-01 20:27:53 +10:00

index.html.haml

fixup merge

2014-09-25 19:47:00 +10:00