Rafael Schouten 20a94b4365 Merge branch 'master' into migrate_ent_types ...

Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb

2014-10-07 10:52:26 +11:00

..

admin

specs - add text angular dep and long descrioption provider

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

darkswarm

bugfix and extend angular enterprise spec

2014-10-06 01:36:18 +11: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