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

Merging master into Neon/unstable 

# Conflicts:
#	debian/control
#	debian/libkf5calendarevents5.install
#	debian/libkf5quickaddons5.symbols
parents 18f4ebc3 906bf87d
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