Commit 00e8adb4 authored by Laurent Montel's avatar Laurent Montel 😁

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

Conflicts:
	kalarm/kalarmapp.cpp
	kalarm/lib/messagebox.h
parents 9bbb4ff6 9d243e93
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