Merge branch 'master' into 'cleanup'
# Conflicts: # src/components/common/LocaleSelector.tsx
Showing
- .prettierrc 0 additions, 1 deletion.prettierrc
- .prettierrc.js 9 additions, 0 deletions.prettierrc.js
- package.json 1 addition, 0 deletionspackage.json
- src/components/common/LocaleSelector.tsx 4 additions, 6 deletionssrc/components/common/LocaleSelector.tsx
- src/components/common/messaging/MessageBox.tsx 9 additions, 11 deletionssrc/components/common/messaging/MessageBox.tsx
- src/components/common/messaging/attachments/Attachment.module.scss 61 additions, 31 deletions...nents/common/messaging/attachments/Attachment.module.scss
- src/components/common/messaging/attachments/Attachment.tsx 7 additions, 1 deletionsrc/components/common/messaging/attachments/Attachment.tsx
- src/components/common/messaging/attachments/AttachmentActions.tsx 20 additions, 27 deletions...onents/common/messaging/attachments/AttachmentActions.tsx
- src/components/navigation/left/HomeSidebar.tsx 3 additions, 4 deletionssrc/components/navigation/left/HomeSidebar.tsx
- src/components/navigation/left/ServerSidebar.tsx 4 additions, 5 deletionssrc/components/navigation/left/ServerSidebar.tsx
- src/components/navigation/left/common.ts 4 additions, 4 deletionssrc/components/navigation/left/common.ts
- src/components/navigation/right/MemberSidebar.tsx 9 additions, 9 deletionssrc/components/navigation/right/MemberSidebar.tsx
- src/context/Theme.tsx 5 additions, 2 deletionssrc/context/Theme.tsx
- src/context/revoltjs/RevoltClient.tsx 9 additions, 10 deletionssrc/context/revoltjs/RevoltClient.tsx
- src/context/revoltjs/StateMonitor.tsx 6 additions, 7 deletionssrc/context/revoltjs/StateMonitor.tsx
- src/context/revoltjs/SyncManager.tsx 7 additions, 8 deletionssrc/context/revoltjs/SyncManager.tsx
- src/context/revoltjs/events.ts 7 additions, 8 deletionssrc/context/revoltjs/events.ts
- src/lib/ContextMenus.tsx 9 additions, 10 deletionssrc/lib/ContextMenus.tsx
- src/pages/settings/panes/Appearance.tsx 9 additions, 10 deletionssrc/pages/settings/panes/Appearance.tsx
- src/pages/settings/panes/Experiments.tsx 7 additions, 8 deletionssrc/pages/settings/panes/Experiments.tsx
Please register or sign in to comment