projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 37d6726)
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 13:17:31 +0000 (14:17 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 13:17:31 +0000 (14:17 +0100)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found
ownCloud Android App