Skip to content
Snippets Groups Projects
Commit 753516c2 authored by Brandon Hewer's avatar Brandon Hewer
Browse files

Merge branch 'master' of github.com:mantidproject/mantid into 21508_OSIRISSetFacilityInUnitTests

# Conflicts:
#	Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py

Refs #21508
parents 6e3ae3b8 d37ee522
No related branches found
No related tags found
No related merge requests found
Showing
with 160 additions and 116 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