Skip to content
Commit 5ec4395f authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'stable-3.0.5' 

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php
parents 7972151d 67fedede
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