Commit cdcc720f authored by Hélène Ortiz's avatar Hélène Ortiz

Merge branch 'master' of https://code.ill.fr/instrument-control/visa-releases/nomadgui-release.git

Conflicts:
	lib64/nomadgui-gtk.linux.x86_64.jar
parents d6f5baac 626abfa1
Markdown is supported
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