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

Merge branch 'devel' into feature/jessie 

Conflicts:
	wiki/src/contribute/release_process/test/setup.mdwn
parents 82584240 98ef6055
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