session-desktop/_locales/en
Mikunj 1f03e04d8c Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23
# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx
2019-04-18 10:13:49 +10:00
..
messages.json Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23 2019-04-18 10:13:49 +10:00