-
Federico Montesino Pouzols authored
Fixed conflicts with last few days changes in master, especially with InstrumentWidget files that have been moved and revamped, re #15246.
f2dadc47
Fixed conflicts with last few days changes in master, especially with InstrumentWidget files that have been moved and revamped, re #15246.