projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d58d6ca bad9f30)
Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)
1  2 
owncloud-android-library patch | diff1 | diff2 | blob | history
res/values/strings.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java patch | diff1 | diff2 | blob | history

diff --cc owncloud-android-library
index 5bd0d73,0030d82..8261865
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd
 -Subproject commit 0030d82ee8156eb82224eaea810e4bf6010feef1
++Subproject commit 8261865ff24c1bfc05be19ae9364a66dac8f26c3
diff --cc res/values/strings.xml
Simple merge
ownCloud Android App