projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7df40c0 92af92e)
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)
commita7859b4ab43cd597a745e9788c78b1cc5eb31d51
tree9b9e6d35d2e2d2d43cbc9f5b6ca52b7b345d05bdtree | snapshot (tar.gz tar.bz2 zip)
parent7df40c01c86a35bba70027e83adc76032dba6c25commit | diff
parent92af92ee3bbefb2c485c4631a86b1a8c11ef7e18commit | diff
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml
res/layout/drawer_list_item.xml diff1 | diff2 | blob | history
ownCloud Android App