diff options
| author | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
| commit | 8a04ca587ab070e482f5836773ad9942584dc26c (patch) | |
| tree | 2581f228d769b431b2678d6b32a908cfaf9e8397 /src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java | |
| parent | d912fa1fd5a385f5e5febc19116fefeb70b347c3 (diff) | |
merge upstream changes
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java | 1 |
1 files changed, 0 insertions, 1 deletions
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; } |