Skip to content
GitLab
Explore
Sign in
Commit
79cb6106
authored
Nov 12, 2014
by
tobiasKaminsky
Browse files
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
Conflicts: src/com/owncloud/android/utils/DisplayUtils.java
parents
2117c024
1efefbd2
Changes
123
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