Rafael Schouten 55f4415c0d Merge branch 'master' into cleanup ...

Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml

2014-09-25 19:42:20 +10:00

..

admin

Adding images to registration process

2014-09-19 12:41:24 +10:00

darkswarm

Merge branch 'master' into cleanup

2014-09-25 19:42:20 +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