projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 932963d 94bc069)
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:42 +0000 (16:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:42 +0000 (16:31 +0200)
1  2 
res/layout/list_item.xml patch | diff1 | diff2 | blob | history

diff --cc res/layout/list_item.xml
Simple merge
ownCloud Android App