projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbc5838 90097b1)
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:24:02 +0000 (12:24 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:24:02 +0000 (12:24 +0100)
1  2 
res/layout/list_item.xml patch | diff1 | diff2 | blob | history

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