Skip to content
Commit 3f7a4548 authored by Laurent Montel's avatar Laurent Montel
Browse files

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

Conflicts:
	kmail/editor/validatesendmailshortcut.cpp
	pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
parents ec593920 793635ba
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