iiii
Merge resolved

Merge branch 'master' of https://github.com/zerodefects/dangerzone

Conflicts:
	draft.txt