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

Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop 

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
parents d15e5cce c0dc4c42
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