projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c78d4f
6698b2d
)
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
author
Andy Scherzinger
<info@andy-scherzinger.de>
Tue, 4 Aug 2015 10:49:28 +0000
(12:49 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Tue, 4 Aug 2015 10:49:28 +0000
(12:49 +0200)
Conflicts:
build.gradle
Trivial merge
projects / pub / Android / ownCloud.git / commitdiff