Skip to content
Snippets Groups Projects
Commit 4fad26e4 authored by Ramesh Kumar's avatar Ramesh Kumar
Browse files

Merge branch 'master' into TMSS-268 

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js

Resolved conflicts and fixed task duration format and task type issues
parents 1417040f 4aba6898
No related branches found
No related tags found
1 merge request!198Resolve TMSS-268
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2387 additions and 1529 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment