Commit e39ceef7 authored by Laurent Montel's avatar Laurent Montel 😁

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

Conflicts:
	agents/folderarchiveagent.desktop
	korgac/korgacagent.desktop
	messageviewer/autotests/gravatarconfigwidgettest.cpp
	messageviewer/widgets/gravatarconfigwidget.cpp
	messageviewer/widgets/gravatarconfigwidget.h
parents 83eca699 a249f1f8
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