Commit 967987c4 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kontact/plugins/kjots/kjots_plugin.desktop
parents 357aa4cd 0246b551
Markdown is supported
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