andy 54ed4f43b4 Resolved conflicts

2021-01-04 18:15:45 +00:00

..

App

Config - Departments - in progress

2019-12-04 13:59:00 +00:00

Base

Config - Departments - in progress

2019-12-04 13:59:00 +00:00

Bus

Jan2021

2021-01-04 18:09:35 +00:00

Data

TS - Bus objects updated + Service classes and forms added

2020-03-23 09:12:33 +00:00

Mgr

Jan2021

2021-01-04 18:09:35 +00:00

WebService

TS - Bus objects updated + Service classes and forms added

2020-03-23 09:12:33 +00:00