Rohan Mitchell 5ac904005b Merge branch 'order-cycle-reports' ...

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

2012-10-31 10:18:11 +11:00

..

admin

Move admin non-Spree controllers out of Spree namespace

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

spree

Merge branch 'order-cycle-reports'

2012-10-31 10:18:11 +11:00

application_controller.rb

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

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

base_controller.rb

WIP Move non-admin non-Spree controllers out of Spree namespace

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

distributors_controller.rb

Update distributor details when distributor is changed

2012-10-27 18:50:09 +11:00

suppliers_controller.rb

WIP Move non-admin non-Spree controllers out of Spree namespace

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