projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1958964 f773d58)
Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Jul 2014 12:21:26 +0000 (14:21 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Jul 2014 12:21:26 +0000 (14:21 +0200)
1  2 
owncloud-android-library patch | diff1 | diff2 | blob | history
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc owncloud-android-library
index 8080e49,f323dda..3c11651
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8080e4904de8f042fdff17691674e900607c66a8
 -Subproject commit f323dda0445b455af638c7e8e4653c22959adb91
++Subproject commit 3c116514fb33992d050f7051e756b6c2244953b0
diff --cc res/values/strings.xml
Simple merge
ownCloud Android App