Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

assets

new rails 3.1.4 app

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

open_food_network

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

seed_data

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

spree

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10:00

tasks

Redesignating all references to user_invoices as account_invoices

2015-09-17 22:38:28 +10:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

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