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

Merge remote-tracking branch 'upstream/develop' into 

bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
parents 712a5135 8d3a956c
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