Skip to content
Commit 79cb6106 authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps 

Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
parents 2117c024 1efefbd2
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