projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: a7859b4)
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 15:45:22 +0000 (17:45 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 15:45:22 +0000 (17:45 +0200)
Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml


No differences found
ownCloud Android App