projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
dea37f6
)
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
author
masensio
<masensio@solidgear.es>
Thu, 22 Aug 2013 10:59:56 +0000
(12:59 +0200)
committer
masensio
<masensio@solidgear.es>
Thu, 22 Aug 2013 10:59:56 +0000
(12:59 +0200)
Conflicts:
res/values-es/strings.xml
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff