projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6219397
a46eb27
)
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
author
Andy Scherzinger
<info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:50:44 +0000
(13:50 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:50:44 +0000
(13:50 +0200)
1
2
src/com/owncloud/android/ui/activity/FileActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/FileActivity.java
Simple merge