TabletDirector-develop

• 

  David Butt 08 Mar 2017 c926977e9175fddce7e51fa83dfccbf51972d8f9

  Merge branch 'Trunk' of http://git.boxworks.com:7990/scm/wm/tabletdirector into Trunk
  # Conflicts:
  #        TabletDirector/Views/Location/Index.cshtml
• 

  David Butt 08 Mar 2017 9b03aadd47a2309089e039ed752280e22b3c4324

  changes for jared

  • TabletDirector/Controllers/LocationController.cs (diffs)
  • TabletDirector/Controllers/WebServiceController.cs (diffs)
  • TabletDirector/Views/Location/Index.cshtml (diffs)