TabletDirector-develop

• 

  David Butt 15 Jun 2017 296d9fdc927f67deb72109ff6fe215f8fe682154

  Merge remote-tracking branch 'origin/3.1' into Trunk
• 

  David Butt 15 Jun 2017 fe5f7cb9e2378048e17e8d461e82d1e2f3870ac5

  uncommented the remove tag when there is an error

  • eCommerce.ServiceLayer/IntegrationServices/ShipStationService.cs (diffs)
• 

  David Butt 15 Jun 2017 faf28c0ae429127862c9d737f142d74711d64eb3

  fix manage inventory icon

  • TabletDirector/Controllers/WebServiceController.cs (diffs)