Rafael Schouten ff4f8f63af Merge branch 'master' into raf_bugfix ...

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

2014-10-02 19:06:30 +10:00

..

assets

Merge branch 'master' into raf_bugfix

2014-10-02 19:06:30 +10:00

controllers

Registration controller checks number of owned enterpises

2014-09-25 12:10:45 +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

Merge branch 'master' into raf_bugfix

2014-10-02 19:06:30 +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

Remove unrequired functions, add has_hub_listing

2014-09-25 17:19:57 +10:00

views

Merge branch 'master' into raf_bugfix

2014-10-02 19:06:30 +10:00