projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ed679c 459bd1e)
Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
Conflicts:
res/layout/list_item.xml

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

diff --cc owncloud-android-library
index ecc3415,ecc3415..17bb724
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
++Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310
ownCloud Android App