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

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

Conflicts:
	akonadi/CMakeLists.txt
parents 7f13aa05 be202dba
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