-
- Downloads
Merge remote-tracking branch 'origin/release-candidate' into develop
# Conflicts: # .docker/Dockerfile # .scripts/set-version.js # packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json
No related branches found
No related tags found
Showing
- .scripts/set-version.js 1 addition, 1 deletion.scripts/set-version.js
- packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json 8 additions, 15 deletions...-google-natural-language/.npm/package/npm-shrinkwrap.json
- packages/rocketchat-lib/client/lib/roomTypes.js 1 addition, 1 deletionpackages/rocketchat-lib/client/lib/roomTypes.js
- packages/rocketchat-lib/lib/settings.js 3 additions, 3 deletionspackages/rocketchat-lib/lib/settings.js
- packages/rocketchat-lib/server/startup/settings.js 19 additions, 0 deletionspackages/rocketchat-lib/server/startup/settings.js
- packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js 18 additions, 2 deletionspackages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
- packages/rocketchat-theme/server/server.js 3 additions, 5 deletionspackages/rocketchat-theme/server/server.js
- packages/rocketchat-ui/client/lib/fireEvent.js 3 additions, 1 deletionpackages/rocketchat-ui/client/lib/fireEvent.js
Loading
Please register or sign in to comment