projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
565875d
f991e1e
)
Merge remote-tracking branch 'origin/operations_service' into operations_service
author
David A. Velasco
<dvelasco@solidgear.es>
Fri, 28 Mar 2014 11:57:44 +0000
(12:57 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Fri, 28 Mar 2014 11:57:44 +0000
(12:57 +0100)
1
2
src/com/owncloud/android/authentication/AuthenticatorActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/services/OperationsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge
diff --cc
src/com/owncloud/android/services/OperationsService.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff