projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
796b1bd
f9b7cbd
)
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
author
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000
(14:45 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000
(14:45 +0200)
Trivial merge