Rohan Mitchell 3982b2a690 Merge branch 'new-spree' ...

Conflicts:
	Gemfile.lock

2013-02-20 15:24:27 +11: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

Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3)

2013-02-14 12:12:19 +11: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

Add calculator to EnterpriseFee, test passes for listing enterprise fees

2012-11-16 16:07:40 +11:00

wrap_parameters.rb

new rails 3.1.4 app

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