projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1cb6b12
b458c92
)
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
author
David A. Velasco
<dvelasco@solidgear.es>
Wed, 14 Aug 2013 15:16:42 +0000
(17:16 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Wed, 14 Aug 2013 15:16:42 +0000
(17:16 +0200)
1
2
src/com/owncloud/android/authentication/AuthenticatorActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff