Rohan Mitchell a3042118c7 Merge branch 'group-reports' ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb

2012-10-26 17:14:49 +11:00

..

assets

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

open_food_web

Fixes to syntax and formatting for group-reports

2012-10-24 15:21:16 +11:00

spree

WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace

2012-10-25 10:45:39 +11:00

tasks

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00