projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
32145d5
)
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
author
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:16:11 +0000
(13:16 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:16:11 +0000
(13:16 +0200)
Conflicts:
res/layout/uploader_layout.xml
No differences found
projects / pub / Android / ownCloud.git / commitdiff