TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 19:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme

Browse Source 
# Conflicts:
#	res/values/strings.xml
This commit is contained in:
Anton Chekulaev
2020-09-02 23:47:31 +10:00
parent 07692c8081 837ca48cde
commit de93b6669e
6 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1860,4 +1860,6 @@
<string name="dialog_ui_mode_option_night">Night</string>
<string name="dialog_ui_mode_option_system_default">System default</string>
<string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
</resources>