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

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

Conflicts:
	debian/changelog
	wiki/src/contribute/APT_repository.mdwn
parents c145c3a4 58ab9ba7
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