mirror of
https://github.com/oxen-io/session-desktop.git
synced 2023-12-14 02:12:57 +01:00
12ce0140de
Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23 # Conflicts: # _locales/en/messages.json # background.html # js/background.js # js/conversation_controller.js # js/models/conversations.js # js/models/messages.js # js/views/conversation_list_item_view.js # js/views/conversation_list_view.js # js/views/conversation_search_view.js # js/views/inbox_view.js # libtextsecure/account_manager.js # package.json # stylesheets/_global.scss # stylesheets/_index.scss # stylesheets/_modules.scss # test/_test.js # test/index.html # test/models/conversations_test.js # test/views/conversation_search_view_test.js # ts/components/ConversationListItem.tsx # ts/components/MainHeader.tsx # ts/components/conversation/ConversationHeader.tsx # ts/components/conversation/ResetSessionNotification.tsx |
||
|---|---|---|
| .. | ||
| lint | ||
| arrayBufferToObjectURL.ts | ||
| cleanSearchTerm.ts | ||
| emoji.ts | ||
| formatRelativeTime.ts | ||
| getInitials.ts | ||
| GoogleChrome.ts | ||
| index.ts | ||
| isFileDangerous.ts | ||
| libphonenumberInstance.ts | ||
| makeLookup.ts | ||
| migrateColor.ts | ||
| missingCaseError.ts | ||
| saveURLAsFile.ts | ||
| timer.ts | ||