jubb 573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources ... # Conflicts: # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-ja/strings.xml		2021-05-18 10:09:26 +10:00
..
conversation_block.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_context.xml	sync dev	2021-01-27 15:54:12 +11:00
conversation_copy_session_id.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_expiring_off.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_expiring_on.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_invite_open_group.xml	open group invitation sending part	2021-05-12 13:41:00 +10:00
conversation_list_search.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_mms_group_options.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_muted.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_popup.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_push_group_options.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_unblock.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation_unmuted.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
conversation.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
media_overview_context.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
media_preview.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
mediapicker_default.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_apply.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_done.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_edit_closed_group.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_pn_mode.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
settings_general.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00