projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 00482b6 e935e92)
Merge branch 'develop'
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)
Conflicts FIXED:
owncloud-android-library

1  2 
owncloud-android-library patch | diff1 | diff2 | blob | history

diff --combined owncloud-android-library
index e71ba7f,c8f6e5a..dbc8c32
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e71ba7faee2b24b285a05fae6a596cf8d5e76b33
 -Subproject commit c8f6e5ad57ee27fdac39c7b14eb6ab1942a92d49
++Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
ownCloud Android App