Commit 69b5678c authored by Laurent Montel's avatar Laurent Montel 😁

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

Conflicts:
	kalarm/alarmcalendar.cpp
parents f39290b0 e756d85f
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