Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

f18dca26

Commit f18dca26 authored 6 years ago by Andrew Morgan

Downloads
- Plain Diff

Merge branch 'develop' into anoa/trailing_slashes_client

parents a8a028df 290552fd

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4793.feature 1 addition, 0 deletions

changelog.d/4793.feature
changelog.d/4847.misc 1 addition, 0 deletions

changelog.d/4847.misc
synapse/crypto/keyring.py 2 additions, 2 deletions

synapse/crypto/keyring.py
synapse/federation/transport/server.py 7 additions, 7 deletions

synapse/federation/transport/server.py
tests/handlers/test_typing.py 3 additions, 3 deletions

tests/handlers/test_typing.py

with 14 additions and 12 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