Rafael Schouten e9dd863462 Merge branch 'master' into payment_description ...

Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb

2014-09-17 17:07:43 +10:00

..

assets

refactor and bugfix for tests

2014-09-17 01:07:34 +10:00

controllers

Merging master into all the things

2014-09-12 13:28:30 +10:00

helpers

Explain weird spree override

2014-09-17 13:12:27 +10:00

mailers

fix typos and add missing helper

2014-09-16 16:10:48 +10:00

models

Sends confirmation email when Enterprise is created

2014-09-12 13:24:17 +10:00

overrides

Merging master into all the things

2014-09-12 13:28:30 +10:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers

Merge branch 'master' into payment_description

2014-09-17 17:07:43 +10:00

views

Merge branch 'master' into payment_description

2014-09-17 17:07:43 +10:00