Skip to content
Commit 2910b006 authored by jabarros's avatar jabarros
Browse files

Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts 

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
parents 1ffa6e96 b20ace91
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment