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

Merge remote-tracking branch 'origin/master' 

Conflicts:
	xsa_gui.py
	xsa_script.py
parents 642c5bda 7c7e1883
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