projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0cb99b 7f13b98)
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:23:36 +0000 (23:23 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:23:36 +0000 (23:23 +0200)
1  2 
res/values/colors.xml patch | diff1 | diff2 | blob | history
res/values/styles.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java patch | diff1 | diff2 | blob | history

diff --cc res/values/colors.xml
Simple merge
diff --cc res/values/styles.xml
Simple merge
ownCloud Android App