Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java
Please register or sign in to comment
Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java