Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

8890a7c3

Unverified Commit 8890a7c3 authored 8 years ago by graywolf336

Downloads
- Plain Diff

Merge branch 'develop' into dont-allow-actions-when-not-in

parents cdf0a2f1 36747351

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-channel-settings/client/views/channelSettings.coffee 1 addition, 1 deletion

...chat-channel-settings/client/views/channelSettings.coffee
packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee 1 addition, 1 deletion

...ons/server/methods/outgoing/addOutgoingIntegration.coffee
packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee 1 addition, 1 deletion

.../server/methods/outgoing/updateOutgoingIntegration.coffee
packages/rocketchat-lib/i18n/de.i18n.json 2 additions, 2 deletions

packages/rocketchat-lib/i18n/de.i18n.json
packages/rocketchat-livechat/server/methods/sendOfflineMessage.js 1 addition, 1 deletion

.../rocketchat-livechat/server/methods/sendOfflineMessage.js
packages/rocketchat-ui/views/app/room.coffee 1 addition, 1 deletion

packages/rocketchat-ui/views/app/room.coffee

with 7 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment