Skip to content
Snippets Groups Projects
Commit e00d11f8 authored by Dan Nixon's avatar Dan Nixon
Browse files

Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction 

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/InelasticIndirectReduction.py
	Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
	Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/InelasticIndirectReductionTest.py
	Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
	Code/Mantid/docs/source/algorithms/CreateCalibrationWorkspace-v1.rst

Refs #10854
parents 5a2dc088 3f3e36e8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 401 additions and 85 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