Skip to content
Snippets Groups Projects
Commit 841555c5 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

Merge remote-tracking branch 'origin/master' into feature/9639_doc_tests_inside_ctest

Conflicts:
	Code/Mantid/Build/Jenkins/buildscript
	Code/Mantid/docs/CMakeLists.txt
	Code/Mantid/docs/runsphinx.py.in
parents 34bd7665 4be23b6f
No related branches found
No related tags found
No related merge requests found
Showing
with 212 additions and 70 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment