Skip to content
Commit d6267698 authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into refresh_folder_contents_when_browsed_into 

Conflicts:
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
parents 31615a24 68d4c74f
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