Merge remote-tracking branch 'remotes/upstream/bug_1251' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:51:37 +0000 (18:51 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:51:37 +0000 (18:51 +0100)
commit5780aca37f2c8d74058b57be6e7f7b3024c26132
tree46cc9525edd4b86865199fc72e1858fcef0a758a
parent8a9983f7311a6bf46dadd7dc73265db240fa8682
parentbb7e95739a7ef1cacc7bb3b7d937d6e5c977362f
Merge remote-tracking branch 'remotes/upstream/bug_1251' into beta
CHANGELOG.md
src/com/owncloud/android/ui/activity/PassCodeActivity.java
src/com/owncloud/android/ui/activity/Preferences.java