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

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

Conflicts:
	akonadi/autotests/tagtest.cpp
parents a2a951dc 50e85f7f
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