Commit 914c0ed3 authored by bliss administrator's avatar bliss administrator

Merge branch 'id11'

Conflicts:
	tomo/Tomo.py
	tomo/TomoSequence.py
parents 5134eeb4 18a80c00
Pipeline #45655 passed with stages
in 3 minutes and 58 seconds