Commit 69b1a58b authored by Yves Watier's avatar Yves Watier

Merge branch 'master' of git://github.com/esrf-bliss/Lima-tango-python

Conflicts:
	camera/Pixirad.py
parents 2b8d5870 c58ecdf8
Pipeline #10461 passed with stages
in 35 seconds