Will Marshall 84955d3647 Merging master

2014-03-06 16:53:03 +11:00

..

assets

Merging master

2014-03-06 16:53:03 +11:00

controllers

Merging master

2014-03-06 16:53:03 +11:00

helpers

Merge branch 'master' into checkout

2014-02-27 16:29:21 +11:00

mailers

Patching up the order mailer to set reply_to

2014-01-16 11:39:10 +11:00

models

Merging master

2014-03-06 16:53:03 +11:00

overrides

Adding Quick Checkout link

2014-03-06 11:01:25 +11:00

presenters

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

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

views

Merging master

2014-03-06 16:53:03 +11:00