projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
66f3a45
)
Merge branch 'develop' into navigationDrawer_basic
author
David A. Velasco
<dvelasco@solidgear.es>
Mon, 15 Jun 2015 11:43:17 +0000
(13:43 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Mon, 15 Jun 2015 11:43:17 +0000
(13:43 +0200)
Conflicts FIXED:
res/layout/files.xml
No differences found