Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

6916ba1a

Commit 6916ba1a authored 9 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

parents 1ee762e8 7c31b56a

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 23 additions, 15 deletions

.travis.yml
.travis/namefiles.sh 5 additions, 3 deletions

.travis/namefiles.sh
.travis/sandstorm.sh 1 addition, 1 deletion

.travis/sandstorm.sh
.travis/setbranch.sh 3 additions, 0 deletions

.travis/setbranch.sh
.travis/setdeploydir.sh 2 additions, 0 deletions

.travis/setdeploydir.sh
.travis/setupsig.sh 8 additions, 0 deletions

.travis/setupsig.sh
.travis/sign.key.gpg 0 additions, 0 deletions

.travis/sign.key.gpg
README.md 1 addition, 1 deletion

README.md
i18n/en.i18n.json 3 additions, 0 deletions

i18n/en.i18n.json
packages/rocketchat-lib/package.js 2 additions, 0 deletions

packages/rocketchat-lib/package.js
packages/rocketchat-lib/server/methods/sendSMTPTestEmail.coffee 29 additions, 0 deletions

...es/rocketchat-lib/server/methods/sendSMTPTestEmail.coffee
packages/rocketchat-lib/server/startup/settings.coffee 1 addition, 7 deletions

packages/rocketchat-lib/server/startup/settings.coffee
packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.coffee 25 additions, 0 deletions

...s/rocketchat-lib/server/startup/settingsOnLoadSMTP.coffee

with 103 additions and 27 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