Commit a90f7516 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Merge branch 'master' into frameworks

Conflicts:
	akonadi/tag.cpp
parents 8dade16b 22466f6a
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