From 8a04ca587ab070e482f5836773ad9942584dc26c Mon Sep 17 00:00:00 2001 From: Christian S Date: Wed, 4 May 2016 21:53:29 +0200 Subject: merge upstream changes --- src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java') diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index bfa690708..b117e55ff 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -158,7 +158,6 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda addAccount.setVisible(!(Config.LOCK_SETTINGS || Config.SINGLE_ACCOUNT)); } addAccountWithCertificate.setVisible(!(Config.LOCK_SETTINGS || Config.SINGLE_ACCOUNT)); - } return true; } -- cgit v1.2.3