projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5169261
0dfe4d2
)
Merge branch 'master' into release-1.7.0
author
David A. Velasco
<dvelasco@solidgear.es>
Tue, 3 Feb 2015 11:46:23 +0000
(12:46 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Tue, 3 Feb 2015 11:46:23 +0000
(12:46 +0100)
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