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

Conflicts:
	Gemfile.lock

2013-02-20 15:24:27 +11:00

..

environments

Install Letter Opener for development environment

2012-12-07 14:31:23 +11:00

initializers

Merge branch 'new-spree'

2013-02-20 15:24:27 +11:00

locales

Add default simple_form configuration, locales, scaffold

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

application.rb

Move presentation to presenter, display calculator fields

2012-11-22 14:37:38 +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 'checkout-changes'

2013-01-22 10:30:51 +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