Commit d5fdc52b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

Conflicts:
	kalarm/messagewin.cpp
parents a7863ee7 060c26da
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