diff options
| author | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
| commit | 74d6d10cb76b7440f57db193a3c38e476206969c (patch) | |
| tree | 665b7787c0f7bcb6d759e849972fa9658e84423f /src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java | |
| parent | 7be757de90fb71042b79b88a76cd36fc07b2ee87 (diff) | |
| parent | f051dd0bcdbd35d101420fb1f75f33a565a1e0f8 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java index c1b5ccc6..12ff2a52 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java @@ -334,7 +334,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.muc_details, menu); - return true; + return super.onCreateOptionsMenu(menu); } @Override |