You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-desktop/ts
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
6 years ago
..
backbone Move left pane entirely to React 6 years ago
components Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23 6 years ago
notifications Use native notifications on all platforms 7 years ago
protobuf Compile all protocol buffers 7 years ago
shims Move left pane entirely to React 6 years ago
state Move left pane entirely to React 6 years ago
styleguide Move left pane entirely to React 6 years ago
test Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23 6 years ago
types Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23 6 years ago
util Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23 6 years ago
OS.ts Fix lint error in OS.ts 7 years ago