Skip to content
Snippets Groups Projects
Commit 07a7074c authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Merge branch 'master' into feature/9579_check_documentation 

Conflicts:
	Code/Mantid/docs/sphinxext/mantiddoc/directives/properties.py
Re #9579
parents df80fd4e 5fc85d94
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 328 additions and 1535 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