Rafael Schouten 58e6379e43 Merge branch 'master' into fix_units ...

Conflicts:
	app/assets/javascripts/admin/products/units_controller.js.coffee

2014-07-14 15:10:26 +01:00

..

blank_option.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

confirm_handler.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

data_fetcher.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

data_submitter.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

dirty_products.js.coffee

Add fields for variant display name and display as to bpe

2014-06-12 11:49:53 +10:00

enterprise_relationships.js.coffee

Further removal of references to 'Admin' from global namespace

2014-05-24 17:15:20 +10:00

enterprises.js.coffee

Further removal of references to 'Admin' from global namespace

2014-05-24 17:15:20 +10:00

option_value_namer.js.coffee

Merge branch 'master' into fix_units

2014-07-14 15:10:26 +01:00

pending_changes.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

switch_class.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

taxons.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00