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

..

api

Merge branch 'master' into payment_description

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

spree/api

refactor and bugfix for tests

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