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

Merge branch 'master' into kubuntu_unstable 

Conflicts:
	debian/control
parents bf04c674 7acd9ab8
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