Skip to content
Commit 55b7cc3e authored by Allen Winter's avatar Allen Winter
Browse files

Merge commit '95c143d27decbf01f6807de9e1e1d588702b2acb' 

Conflicts:
	akonadi/contact/standardcontactformatter.cpp
parents 614fb6e2 09edd845
Hide whitespace changes
Inline Side-by-side
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