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

TMSS-348: Merge branch 'TMSS-235' into TMSS-348 

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js

All conflicts resolved
parents 64d4c7c1 e556a894
No related branches found
No related tags found
1 merge request!214Resolve TMSS-348 - Merged other local branches
Hide whitespace changes
Inline Side-by-side
Showing
with 299 additions and 37 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