Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

9c100ff3

Unverified Commit 9c100ff3 authored 4 years ago by Diego Sampaio

Downloads
- Plain Diff

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

parents 1981ed92 af4a21a5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/authorization/server/streamer/permissions/emitter.js 4 additions, 1 deletion

app/authorization/server/streamer/permissions/emitter.js
app/federation/server/endpoints/dispatch.js 1 addition, 1 deletion

app/federation/server/endpoints/dispatch.js
app/federation/server/handler/index.js 1 addition, 4 deletions

app/federation/server/handler/index.js
app/federation/server/lib/callbacks.js 12 additions, 3 deletions

app/federation/server/lib/callbacks.js
server/publications/settings/emitter.js 4 additions, 0 deletions

server/publications/settings/emitter.js

with 22 additions and 9 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