diff options
| author | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
| commit | c18696c85d5801dfd39ffe494240b5f849deedb8 (patch) | |
| tree | a51ac3bbfab1c656a3e00f8725d5e09b774f94c1 /src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | |
| parent | 024b2c80aa6da4adf2a48d89047a72bbb2bda5ad (diff) | |
| parent | cc67bfd8dbae334a121c9d40c13c3816b9eb72a0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index c0e248376..b2d9e1d83 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -297,7 +297,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd edit.setVisible(false); delete.setVisible(false); } - return true; + return super.onCreateOptionsMenu(menu); } private void populateView() { |