Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 060ca75f authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into forbidden_characters_from_server 

Conflicts:
	src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
	src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
parents 4ca0ff22 639cb7ea
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment