projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e55ef9
eafaf80
)
Merge branch 'develop' into share_password_support
author
masensio
<masensio@solidgear.es>
Fri, 6 Mar 2015 09:19:06 +0000
(10:19 +0100)
committer
masensio
<masensio@solidgear.es>
Fri, 6 Mar 2015 09:19:06 +0000
(10:19 +0100)
1
2
src/com/owncloud/android/operations/CreateShareOperation.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/services/OperationsService.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/activity/FileActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/operations/CreateShareOperation.java
Simple merge
diff --cc
src/com/owncloud/android/services/OperationsService.java
Simple merge
diff --cc
src/com/owncloud/android/ui/activity/FileActivity.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff