Skip to content
Commit 5c390b2b authored by Franziska Koehn's avatar Franziska Koehn
Browse files

Merge branch 'master' of mosel.cbs.mpg.de:xnat/xnat-scan-ambassador 

Conflicts:
	README.md
parents d1f67825 b69bf459
Hide whitespace changes
Inline Side-by-side
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