Rohan Mitchell 6d84cf7613 Merge branch 'master' into enterprises ...

Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb

2012-11-01 11:02:02 +11:00

..

environments

Use S3 configuration from environment vars instead of s3.yml

2012-10-19 16:40:18 +11:00

initializers

Use S3 configuration from environment vars instead of s3.yml

2012-10-19 16:40:18 +11:00

locales

Add default simple_form configuration, locales, scaffold

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

application.rb

Precompile CMS assets

2012-10-11 11:06:52 +11:00

boot.rb

new rails 3.1.4 app

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

database.yml

update database and gemfile

2012-03-27 11:00:47 +11:00

environment.rb

spree install.

2012-03-27 11:06:49 +11:00

routes.rb

Merge branch 'master' into enterprises

2012-11-01 11:02:02 +11:00

spree.yml

spree install.

2012-03-27 11:06:49 +11:00

unicorn.rb

switch to unicorn.

2012-03-27 11:22:20 +11:00