projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: af2af71)
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)
Conflicts:
res/layout/ssl_untrusted_cert_layout.xml
res/layout/ssl_validator_layout.xml


No differences found
ownCloud Android App