Merge remote-tracking branch 'origin/develop' into improvements/more-streams
# Conflicts: # packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee # packages/rocketchat-ui/views/app/room.coffee
No related branches found
No related tags found
Showing
- .openshift/rocket-chat-ephemeral.json 395 additions, 0 deletions.openshift/rocket-chat-ephemeral.json
- .openshift/rocket-chat-is.json 32 additions, 0 deletions.openshift/rocket-chat-is.json
- .openshift/rocket-chat-persistent.json 427 additions, 0 deletions.openshift/rocket-chat-persistent.json
- .sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions.sandstorm/sandstorm-pkgdef.capnp
- HISTORY.md 76 additions, 0 deletionsHISTORY.md
- docker-compose.yml 3 additions, 0 deletionsdocker-compose.yml
- packages/rocketchat-lib/i18n/ca.i18n.json 1 addition, 0 deletionspackages/rocketchat-lib/i18n/ca.i18n.json
- packages/rocketchat-lib/i18n/cs.i18n.json 11 additions, 0 deletionspackages/rocketchat-lib/i18n/cs.i18n.json
- packages/rocketchat-lib/i18n/fr.i18n.json 1 addition, 1 deletionpackages/rocketchat-lib/i18n/fr.i18n.json
- packages/rocketchat-lib/i18n/it.i18n.json 3 additions, 119 deletionspackages/rocketchat-lib/i18n/it.i18n.json
- packages/rocketchat-lib/rocketchat.info 1 addition, 1 deletionpackages/rocketchat-lib/rocketchat.info
- packages/rocketchat-livechat/app/i18n/it.i18n.json 0 additions, 1 deletionpackages/rocketchat-livechat/app/i18n/it.i18n.json
- packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.less 2 additions, 1 deletion...ge-attachments/client/stylesheets/messageAttachments.less
- packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee 1 addition, 1 deletionpackages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
- packages/rocketchat-ui/views/app/room.coffee 1 addition, 2 deletionspackages/rocketchat-ui/views/app/room.coffee
Loading
Please register or sign in to comment