Commit 3c411780 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

Conflicts:
	akonadi/src/core/itemsync.cpp
parents 3d820cc0 7af2cb1d
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