Rafael Schouten 8395dbb3e9 Merge branch 'master' into config ...

Conflicts:
	.gitignore
	Gemfile

2014-10-25 15:29:53 +11:00

..

assets

fix navigation check on submission

2014-10-22 15:34:31 +11:00

controllers

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

helpers

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

mailers

Only send one enterprise creation confirmation email

2014-10-17 12:29:51 +11:00

models

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

overrides

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

presenters

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

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

serializers

Make state abbreviations upper case

2014-10-17 12:29:51 +11:00

views

Merge branch 'master' into config

2014-10-25 15:29:53 +11:00