projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 2910b00)
Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
authorjabarros <jabarros@solidgear.es>
Wed, 15 Oct 2014 10:20:49 +0000 (12:20 +0200)
committerjabarros <jabarros@solidgear.es>
Wed, 15 Oct 2014 10:20:49 +0000 (12:20 +0200)
Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java


No differences found
ownCloud Android App