Will Marshall 1e7e1a3127 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork ...

Conflicts:
	spec/features/consumer/shopping/checkout_spec.rb

2014-05-02 16:12:41 +10:00

..

checkout_auth_spec.rb

Renaming our partials

2014-05-02 14:47:12 +10:00

checkout_spec.rb

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork

2014-05-02 16:12:41 +10:00

shopping_spec.rb

Bugged thing in the shop spec

2014-05-02 10:18:57 +10:00