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

Merge branch 'TMSS-222' into TMSS-216 

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js

Resolved Conflicts
parents f9629ec6 bcdfb454
No related branches found
No related tags found
1 merge request!191Resolve TMSS-243
Hide whitespace changes
Inline Side-by-side
Showing
with 851 additions and 2 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