Skip to content
GitLab
Explore
Sign in
Commit
066cd5aa
authored
Oct 15, 2013
by
masensio
Browse files
Merge branch 'develop' into contact_settings
Conflicts: res/values/strings.xml
parents
b708d46d
a67a6766
Changes
120
Expand all
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment