Skip to content
Snippets Groups Projects
Commit 4f0009e3 authored by Karl Palmen's avatar Karl Palmen
Browse files

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


Conflicts:
	Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py

For re #4073

Signed-off-by: default avatarKarl Palmen <karl.palmen@stfc.ac.uk>
parents 7f0d204e 679b2dcd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 612 additions and 119 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