Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
Showing
- packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee 4 additions, 2 deletions...-channel-settings-mail-messages/client/lib/startup.coffee
- packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee 49 additions, 5 deletions...ail-messages/client/views/mailMessagesInstructions.coffee
- packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html 13 additions, 2 deletions...-mail-messages/client/views/mailMessagesInstructions.html
- packages/rocketchat-channel-settings-mail-messages/i18n/en.i18n.json 4 additions, 3 deletions...cketchat-channel-settings-mail-messages/i18n/en.i18n.json
- packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee 14 additions, 5 deletions...settings-mail-messages/server/methods/mailMessages.coffee
- packages/rocketchat-lib/server/models/Users.coffee 18 additions, 0 deletionspackages/rocketchat-lib/server/models/Users.coffee
- packages/rocketchat-livechat/client/route.js 0 additions, 12 deletionspackages/rocketchat-livechat/client/route.js
- packages/rocketchat-livechat/server/methods/sendMessageLivechat.js 1 addition, 1 deletion...rocketchat-livechat/server/methods/sendMessageLivechat.js
- server/publications/userAutocomplete.coffee 28 additions, 0 deletionsserver/publications/userAutocomplete.coffee
Loading
Please register or sign in to comment