diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
| commit | cd0c6ce48e2ac36d9524908acbbc79690b193d9a (patch) | |
| tree | e03621214377147d44a13917485baf16b607a11a /src/main/res/menu | |
| parent | 8fb6204288d55f8af16ae47e32fa6c049284cadd (diff) | |
| parent | c393e6089177f31683c4cecfdb359802de1b5e0c (diff) | |
Merge tag '1.10.1' into trz/merge_1.10.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/res/menu/message_context.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/message_context.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 2fe1ca22..41233931 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -9,6 +9,10 @@ android:title="@string/copy_text" android:visible="false"/> <item + android:id="@+id/retry_decryption" + android:title="Retry decryption" + android:visible="false"/> + <item android:id="@+id/share_with" android:title="@string/share_with" android:visible="false"/> |