projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
b81de1d
)
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
author
masensio
<masensio@solidgear.es>
Tue, 25 Aug 2015 12:53:42 +0000
(14:53 +0200)
committer
masensio
<masensio@solidgear.es>
Tue, 25 Aug 2015 12:53:42 +0000
(14:53 +0200)
Conflicts:
res/layout/uploader_layout.xml
No differences found
projects / pub / Android / ownCloud.git / commitdiff