Merge branch 'develop' into refactor_remote_operation_to_create_folder
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 13:10:16 +0000 (14:10 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 13:10:16 +0000 (14:10 +0100)
commite1245bbda7894e1a3028d2b54a6918e4bdd46ae2
tree635493cb1299f0bbe6efa674f919e1f2f10ad89d
parent73849d822d10b4037d6f1cf835e0d01ae484740b
parentd7559f22a9197b7c2810f6e2aa7e91e796926bd1
Merge branch 'develop' into refactor_remote_operation_to_create_folder
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileObserverService.java