Skip to content
Snippets Groups Projects
Commit bfe61dbe authored by Ray Liu's avatar Ray Liu
Browse files

Merge branch 'web' of https://gitlab.cas.mcmaster.ca/schankuc/2XB3 into 

web

# Conflicts:
#	tomcat/webapps/Trawl/WEB-INF/web.xml
#	tomcat/webapps/Trawl/index.jsp
#	tomcat/webapps/Trawl/infoWindow.js
#	tomcat/webapps/Trawl/script.js
parents f6cfdc33 d1f7464b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 571 additions and 56 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