Will Marshall b8cc2de91e Merge branch 'master' into laura_and_will ...

Conflicts:
	db/schema.rb

2014-06-19 12:49:58 +10:00

..

assets

Fixing up hub modal

2014-06-19 12:49:28 +10:00

controllers

Merge branch 'laura_and_will'

2014-06-19 12:11:12 +10:00

helpers

Merge branch 'laura_and_will'

2014-06-19 12:11:12 +10:00

mailers

Adding a signup confirmation email

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

models

Enterprise user can manage their enterprises' producer properties

2014-06-18 16:04:41 +10:00

overrides

Rearrange shipping method edit page

2014-06-18 10:21:21 +10:00

presenters

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

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

views

Merge branch 'laura_and_will'

2014-06-19 12:11:12 +10:00