projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d612f37
30ab377
)
Merge branch 'fixed_contradicted_messages_in_login_view' into develop
author
David A. Velasco
<dvelasco@solidgear.es>
Wed, 19 Jun 2013 10:17:16 +0000
(12:17 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Wed, 19 Jun 2013 10:17:16 +0000
(12:17 +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