Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

feef8461

Commit feef8461 authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

Merge remote-tracking branch 'hera/rav/server_acls' into develop

parents 1a886406 3cf3e08a

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/constants.py 2 additions, 0 deletions

synapse/api/constants.py
synapse/federation/federation_server.py 148 additions, 2 deletions

synapse/federation/federation_server.py
synapse/federation/transport/server.py 6 additions, 2 deletions

synapse/federation/transport/server.py
tests/federation/__init__.py 0 additions, 0 deletions

tests/federation/__init__.py
tests/federation/test_federation_server.py 57 additions, 0 deletions

tests/federation/test_federation_server.py

with 213 additions and 4 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