Merge remote-tracking branch 'origin/develop' into release-candidate
Showing
- app/api/server/v1/users.js 2 additions, 2 deletionsapp/api/server/v1/users.js
- app/e2e/server/methods/resetOwnE2EKey.js 1 addition, 1 deletionapp/e2e/server/methods/resetOwnE2EKey.js
- app/version-check/server/index.js 12 additions, 5 deletionsapp/version-check/server/index.js
- client/admin/users/UserForm.js 91 additions, 89 deletionsclient/admin/users/UserForm.js
- client/channel/ExportMessages/index.js 22 additions, 18 deletionsclient/channel/ExportMessages/index.js
- client/components/basic/Buttons/ActionButton.js 1 addition, 1 deletionclient/components/basic/Buttons/ActionButton.js
- client/components/basic/PlanTag.js 1 addition, 1 deletionclient/components/basic/PlanTag.js
- client/components/basic/Sidebar.js 3 additions, 2 deletionsclient/components/basic/Sidebar.js
- packages/rocketchat-i18n/i18n/en.i18n.json 3 additions, 0 deletionspackages/rocketchat-i18n/i18n/en.i18n.json
- server/lib/resetUserE2EKey.ts 57 additions, 1 deletionserver/lib/resetUserE2EKey.ts
Loading
Please register or sign in to comment