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

Merge branch 'contact_settings' into setup_app_name 

Conflicts:
	res/values/setup.xml
parents 31f6e61f 9681b868
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