Rafael Schouten 1aa80e53b1 Merge branch 'master' into currency ...

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

2014-09-16 10:25:22 +10:00

..

cart_spec.js.coffee

…

checkout_spec.js.coffee

…

enterprise_registration_spec.js.coffee

…

enterprise_spec.js.coffee

…

groups_spec.js.coffee

…

hubs_spec.js.coffee

…

map_spec.js.coffee

…

navigation.js.coffee

…

order_cycle_spec.js.coffee

…

producers_spec.js.coffee

…

product_spec.js.coffee

…

shipping_methods_spec.js.coffee

…

sidebar_spec.js.coffee

…

taxon_spec.js.coffee

…

variants_spec.js.coffee

…