Rohan Mitchell fe61cddda6 Merge branch 'local-organics' ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb

2013-07-23 11:40:03 +10:00

..

backtrace_silencers.rb

new rails 3.1.4 app

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

bugsnag.rb

Bugsnag uses SSL, notify on staging as well as production

2013-02-20 10:09:43 +11:00

comfortable_mexican_sofa.rb

WIP (Spree Update): Update reference to current_user -> spree_current_user

2013-07-23 10:43:08 +10:00

db2fog.rb

Install db2fog for S3 database backups

2013-05-05 14:19:56 +10:00

inflections.rb

new rails 3.1.4 app

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

mime_types.rb

new rails 3.1.4 app

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

secret_token.rb

new rails 3.1.4 app

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

session_store.rb

new rails 3.1.4 app

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

simple_form.rb

Add default simple_form configuration, locales, scaffold

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

spree.rb

Do not set site name and logo URLs in initializer, so that they can be set through admin interface

2013-06-04 08:43:35 +10:00

wrap_parameters.rb

new rails 3.1.4 app

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