Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +11:00

..

darkswarm

Our feature spec is breaking but we'll work that out

2013-12-19 10:44:47 +11:00

bulk_product_update_spec.js.coffee

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11:00

order_cycle_spec.js.coffee

Getting the test framework set up for Angular, setting up a products fetch stub

2013-12-06 15:24:42 +11:00