Will Marshall 84955d3647 Merging master

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

..

checkout_controller.rb

Overring before_address to conform to our new checkout as necessary

2014-03-06 16:24:08 +11:00

shop_controller.rb

Do not show products that have no stock available to the current distribution

2014-03-05 13:54:02 +11:00