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

..

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 'order-cycle-reports'

2012-10-31 10:18:11 +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