Skip to content
Commit 9b35f24f authored by Maximiliano Curia's avatar Maximiliano Curia
Browse files

Merge commit 'c2116fc6' 

Conflicts:
	debian/control
	debian/libkf5windowsystem5.symbols
parents dcd4fbf0 c2116fc6
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