projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7d6939 60e0f09)
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 13 Aug 2015 13:57:38 +0000 (15:57 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 13 Aug 2015 13:57:38 +0000 (15:57 +0200)
commitaf2af7198b3919fb476e78d252e28216bb643d82
treec08f4e76a307f97299d61a8375422b1f6168bf18tree | snapshot (tar.gz tar.bz2 zip)
parentf7d6939264b3695e605cfe43b97e22bc32ac174fcommit | diff
parent60e0f09278b2db11e713680f1bc57a31bd3286b5commit | diff
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

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