projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1df33a 2aac1e5)
Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:35:19 +0000 (09:35 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:35:19 +0000 (09:35 +0100)
1  2 
owncloud-android-library patch | diff1 | diff2 | blob | history
res/values-th-rTH/strings.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/authentication/AuthenticatorActivity.java patch | diff1 | diff2 | blob | history
src/com/owncloud/android/operations/UploadFileOperation.java patch | diff1 | diff2 | blob | history

diff --cc owncloud-android-library
index 4f9a752,b09969d..ecc3415
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4f9a7528cab0563cb234a8b817e8ee371dd6cc25
 -Subproject commit b09969d078b3a790b01c8d61a7298a37439a9f24
++Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
diff --cc res/values-th-rTH/strings.xml
Simple merge
ownCloud Android App