projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 6eccdc2)
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:06:14 +0000 (13:06 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:06:14 +0000 (13:06 +0200)
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java


No differences found
ownCloud Android App