Rafael Schouten 9a6958573a Merge branch 'master' into bugfix ...

Conflicts:
	app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

2014-10-12 21:19:02 +11:00

..

assets

Merge branch 'master' into bugfix

2014-10-12 21:19:02 +11:00

controllers

Product controller loads correct data for create and update actions

2014-10-02 12:32:26 +10:00

helpers

fix failing tests

2014-10-04 11:56:35 +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

Merge branch 'master' into raf_bugfix

2014-10-04 12:51:55 +10:00

presenters

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

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

serializers

fix failing tests

2014-10-04 11:56:35 +10:00

views

Merge branch 'master' into raf_bugfix

2014-10-04 12:51:55 +10:00