Merge remote-tracking branch 'origin/develop' into release-candidate
Showing
- app/apps/client/gameCenter/gameCenter.js 3 additions, 4 deletionsapp/apps/client/gameCenter/gameCenter.js
- app/apps/client/gameCenter/gameContainer.html 1 addition, 1 deletionapp/apps/client/gameCenter/gameContainer.html
- app/apps/client/gameCenter/invitePlayers.js 16 additions, 6 deletionsapp/apps/client/gameCenter/invitePlayers.js
- app/apps/client/gameCenter/tabBar.js 2 additions, 6 deletionsapp/apps/client/gameCenter/tabBar.js
- app/lib/server/functions/createDirectRoom.js 2 additions, 2 deletionsapp/lib/server/functions/createDirectRoom.js
- app/livestream/client/tabBar.js 6 additions, 2 deletionsapp/livestream/client/tabBar.js
- app/models/server/models/Rooms.js 1 addition, 1 deletionapp/models/server/models/Rooms.js
- app/ui-cached-collection/client/models/CachedCollection.js 1 addition, 1 deletionapp/ui-cached-collection/client/models/CachedCollection.js
- app/ui-utils/client/lib/RoomManager.js 5 additions, 1 deletionapp/ui-utils/client/lib/RoomManager.js
- app/ui-utils/client/lib/TabBar.js 17 additions, 0 deletionsapp/ui-utils/client/lib/TabBar.js
- packages/rocketchat-i18n/i18n/en.i18n.json 5 additions, 4 deletionspackages/rocketchat-i18n/i18n/en.i18n.json
- packages/rocketchat-i18n/i18n/pt-BR.i18n.json 1 addition, 1 deletionpackages/rocketchat-i18n/i18n/pt-BR.i18n.json
- packages/rocketchat-i18n/i18n/zh.i18n.json 1 addition, 1 deletionpackages/rocketchat-i18n/i18n/zh.i18n.json
Loading
Please register or sign in to comment