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

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	akonadi/collectionrequester.h
	akonadi/itemsearchjob.cpp
	akonadi/recentcollectionaction.cpp
	akonadi/recentcollectionaction_p.h
	akonadi/standardactionmanager.cpp
	kabc/plugins/dir/dir.desktop
	kabc/plugins/file/file.desktop
	kabc/plugins/ldapkio/ldapkio.desktop
	kabc/plugins/net/net.desktop
	kcal/localdir.desktop
parents 0f261285 c104b298
Supports Markdown
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