Skip to content
Snippets Groups Projects
Commit 70a5f6f7 authored by Antti Soininen's avatar Antti Soininen
Browse files

Merge branch 'refs/heads/master' into 20632_MantidMatrix_DX_fixes 

Conflicts:
	MantidPlot/src/Mantid/MantidMatrixTabExtension.h

Re #20632
parents 6fe56636 11066e45
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 85 additions and 75 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