projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
fba65e3
)
Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies
author
masensio
<masensio@solidgear.es>
Fri, 13 Feb 2015 13:39:35 +0000
(14:39 +0100)
committer
masensio
<masensio@solidgear.es>
Fri, 13 Feb 2015 13:39:35 +0000
(14:39 +0100)
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff