Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

8e2d5b6e

Unverified Commit 8e2d5b6e authored 8 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge branch 'develop' into internal-bot

parents 5bcc8cb4 f374f910

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-autolinker/autolinker.coffee 4 additions, 1 deletion

packages/rocketchat-autolinker/autolinker.coffee
packages/rocketchat-autolinker/lib/Autolinker.min.js 2 additions, 2 deletions

packages/rocketchat-autolinker/lib/Autolinker.min.js
packages/rocketchat-autolinker/settings.coffee 3 additions, 1 deletion

packages/rocketchat-autolinker/settings.coffee
packages/rocketchat-lib/i18n/en.i18n.json 3 additions, 1 deletion

packages/rocketchat-lib/i18n/en.i18n.json
packages/rocketchat-lib/i18n/ja.i18n.json 3 additions, 1 deletion

packages/rocketchat-lib/i18n/ja.i18n.json
private/node_scripts/package.json 9 additions, 0 deletions

private/node_scripts/package.json
server/startup/migrations/v047.js 29 additions, 0 deletions

server/startup/migrations/v047.js

with 53 additions and 6 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