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

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

Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
parents e5515c1a 25a36a4f
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