projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dfcbaf9
bbfa65c
)
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
author
Andy Scherzinger
<info@andy-scherzinger.de>
Sun, 22 Nov 2015 16:10:37 +0000
(17:10 +0100)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Sun, 22 Nov 2015 16:10:37 +0000
(17:10 +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