Skip to content
Commit da8d800d authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/devel' into bugfix/9044-syslinux-on-chromebooks 

Conflicts:
	run_test_suite
parents ff0f4275 99908bb4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment