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

Merge branch 'TMSS-342' into TMSS-348 

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js

Merged TMSS-347 into TMSS-348

Resolved all conflicts
parents bab738b1 3e90b65f
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 70 additions and 36 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