Rohan Mitchell 422061f137 Merge branch 'master' into products-caching ...

Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb

2016-03-03 09:42:52 +11:00

..

assets

new rails 3.1.4 app

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

discourse

SingleSignOn controller with routes and config

2016-01-07 12:58:30 +11:00

open_food_network

Merge branch 'master' into products-caching

2016-03-03 09:42:52 +11:00

seed_data

New landing page - initial layout and functionality

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

spree

Adding helper for describing monthly billing charges

2015-12-16 19:18:57 +11:00

tasks

Fix problems in rake file

2016-03-02 11:38:42 +11:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

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