Rohan Mitchell 83e3c6815d Merge branch 'checkout-changes' ...

Conflicts:
	.rvmrc
	app/helpers/application_helper.rb

2013-01-22 10:30:51 +11:00

..

assets

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

controllers

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

helpers

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

mailers

new rails 3.1.4 app

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

models

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

overrides

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

presenters

Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.

2012-11-23 17:02:58 +11:00

views

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00