Merge branch 'develop' into idn_hosts
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
commit69320c88057be535f9d756247bcd4fb72b53857d
treef33f84ab2073b7e4dba106c58ec4f2308180190c
parent2910b006735fc7848bd7f357458332a542871bb8
parent832a98f47c4f399141c2e36af09509853727ba5b
Merge branch 'develop' into idn_hosts
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/Preferences.java