Skip to content
Commit dcb98548 authored by jabarros's avatar jabarros
Browse files

Merge branch 'develop' into thumbnails_from_server 

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
parents 13fab932 495c8126
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