Skip to content
Commit 7b42c814 authored by Harald Sitter's avatar Harald Sitter 🍌
Browse files

Merge branch 'master' into kubuntu_unstable 

Conflicts:
	debian/control
parents 8c716ffa 318b43b6
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