Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

admin

Removing trailing whitespace

2014-07-24 10:28:28 +10:00

darkswarm

Working version of the cart integration

2014-07-18 14:56:15 +10:00

bulk_order_management_spec.js.coffee

Call VariantUnitManager directly

2014-07-18 12:39:16 +10:00

bulk_product_update_spec.js.coffee

BPE uses soft-delete for products

2014-06-12 14:59:27 +10:00

order_cycle_spec.js.coffee

Patching a test and removing our duped Angular libs

2014-04-08 18:09:02 +10:00