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

..

admin

Fix broken JS specs

2014-09-12 11:12:35 +10:00

darkswarm

Merge branch 'master' into currency

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

bulk_order_management_spec.js.coffee

Fix failing bulk specs

2014-09-11 17:10:58 +10:00

bulk_product_update_spec.js.coffee

Fix failing bulk specs

2014-09-11 17:10:58 +10:00

order_cycle_spec.js.coffee

When removing outgoing exchanges, do not removing variants from other outgoing exchanges

2014-09-12 12:50:04 +10:00