Will Marshall 7953ff145c Fixing a merge issue

2014-06-06 17:23:28 +10:00

..

assets

Merge branch 'master' into maps

2014-06-06 17:21:27 +10:00

controllers

Reworking flash messages hooray

2014-06-06 16:41:28 +10:00

helpers

Basic but hacky way to get events out of map

2014-06-06 14:04:46 +10:00

mailers

Adding a signup confirmation email

2014-04-08 18:06:49 +10:00

models

Removing shipping method from order when emptied

2014-06-06 16:39:53 +10:00

overrides

Remove unused overrides for primary taxons and product/new

2014-05-30 15:48:36 +10:00

presenters

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

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

views

Fixing a merge issue

2014-06-06 17:23:28 +10:00