Merge remote-tracking branch 'upstream/master'
Showing
- external/lang 1 addition, 1 deletionexternal/lang
- src/components/common/messaging/attachments/MessageReply.tsx 0 additions, 3 deletionssrc/components/common/messaging/attachments/MessageReply.tsx
- src/components/common/messaging/bars/ReplyBar.tsx 30 additions, 10 deletionssrc/components/common/messaging/bars/ReplyBar.tsx
- src/components/navigation/right/MemberList.tsx 33 additions, 11 deletionssrc/components/navigation/right/MemberList.tsx
- src/context/Theme.tsx 0 additions, 3 deletionssrc/context/Theme.tsx
- src/context/intermediate/modals/Input.tsx 11 additions, 13 deletionssrc/context/intermediate/modals/Input.tsx
- src/context/intermediate/popovers/UserProfile.tsx 45 additions, 6 deletionssrc/context/intermediate/popovers/UserProfile.tsx
- src/lib/ContextMenus.tsx 51 additions, 49 deletionssrc/lib/ContextMenus.tsx
- src/pages/channels/messaging/MessageArea.tsx 0 additions, 1 deletionsrc/pages/channels/messaging/MessageArea.tsx
- src/pages/invite/InviteBot.tsx 1 addition, 1 deletionsrc/pages/invite/InviteBot.tsx
- src/pages/settings/server/Members.tsx 1 addition, 3 deletionssrc/pages/settings/server/Members.tsx
Please register or sign in to comment