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

Merge branch 'kubuntu_wily_archive' into kubuntu_unstable 

Conflicts:
	debian/libkf5unitconversion5.symbols
parents de9f043e 30e727c0
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