Merge remote-tracking branch 'loki/dev' into light-theme

This commit is contained in:
Anton Chekulaev
2020-08-25 15:11:51 +10:00
16 changed files with 88 additions and 35 deletions

View File

@@ -1853,4 +1853,6 @@
<string name="dialog_seed_disclaimer">*Please note that it is not possible to use the same Session ID on multiple devices simultaneously</string>
<string name="view_reset_secure_session_done_message">Secure session reset done</string>
</resources>