Merge pull request #3965 from RocketChat/4.26.0-rc.2
Merge develop into beta for 4.26.0-rc.2
Showing
- app/containers/HeaderButton/Common.tsx 22 additions, 18 deletionsapp/containers/HeaderButton/Common.tsx
- app/containers/HeaderButton/HeaderButtonContainer.tsx 2 additions, 2 deletionsapp/containers/HeaderButton/HeaderButtonContainer.tsx
- app/containers/HeaderButton/HeaderButtonItem.tsx 18 additions, 16 deletionsapp/containers/HeaderButton/HeaderButtonItem.tsx
- app/containers/HeaderButton/HeaderButtonItemBadge.tsx 1 addition, 1 deletionapp/containers/HeaderButton/HeaderButtonItemBadge.tsx
- app/views/DirectoryView/index.tsx 9 additions, 9 deletionsapp/views/DirectoryView/index.tsx
- app/views/RoomInfoEditView/index.tsx 1 addition, 2 deletionsapp/views/RoomInfoEditView/index.tsx
- package.json 1 addition, 1 deletionpackage.json
- yarn.lock 29 additions, 20 deletionsyarn.lock
Loading
Please register or sign in to comment