Skip to content
Commit 65f403bf authored by David A. Velasco's avatar David A. Velasco
Browse files

Merge branch 'develop' into fixForCrashedSharedContents 

Conflicts:
	src/com/owncloud/android/Uploader.java
parents e0ce2d4d 52bd01bc
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