masensio 060ca75f17 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

2015-06-15 14:41:27 +02:00

..

GetRemoteStatusOperation.java

Get that ExistenceCheckRemoteOperation remembers the sequence of followed redirections after its execution

2015-06-11 10:32:05 +02:00

OwnCloudVersion.java

Filter only '/' character in user input when version of server is 8.1 or later

2015-06-02 09:37:46 +02:00