Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

702d43a9

Unverified Commit 702d43a9 authored 4 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into release-candidate

parents b8c98151 3c09dda6

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VIP Sponsors.md 7 additions, 0 deletions

VIP Sponsors.md
app/apps/server/bridges/http.js 5 additions, 0 deletions

app/apps/server/bridges/http.js
app/apps/server/bridges/uploads.js 29 additions, 9 deletions

app/apps/server/bridges/uploads.js
app/file-upload/server/lib/FileUpload.js 1 addition, 1 deletion

app/file-upload/server/lib/FileUpload.js
app/file-upload/server/methods/sendFileMessage.js 5 additions, 3 deletions

app/file-upload/server/methods/sendFileMessage.js
app/lib/server/startup/userDataStream.js 25 additions, 0 deletions

app/lib/server/startup/userDataStream.js
app/models/server/models/LoginServiceConfiguration.js 7 additions, 0 deletions

app/models/server/models/LoginServiceConfiguration.js
client/admin/apps/AppSettings.js 2 additions, 0 deletions

client/admin/apps/AppSettings.js
package-lock.json 9 additions, 49 deletions

package-lock.json
package.json 1 addition, 1 deletion

package.json

with 91 additions and 63 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