Rob Harrington 903ed7e507 Merge branch 'master' into variable_weights ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb

2015-05-21 17:31:33 +10:00

..

unit

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

application_spec.js

specs - add text angular dep and long descrioption provider

2014-10-03 16:42:37 +10:00

mock_google_maps.js.coffee

Reworking the RABL templates for simplicity AND fixing up all the tests

2014-06-18 13:05:44 +10:00