Skip to content
Commit 066cd5aa authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into contact_settings 

Conflicts:
	res/values/strings.xml
parents b708d46d a67a6766
Expand all 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