Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

2635d4e6

Commit 2635d4e6 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into develop

parents 1177245e fe672a04

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 1 addition, 0 deletions

synapse/app/homeserver.py
synapse/federation/federation_client.py 39 additions, 3 deletions

synapse/federation/federation_client.py
synapse/federation/federation_server.py 19 additions, 2 deletions

synapse/federation/federation_server.py
synapse/federation/transaction_queue.py 20 additions, 2 deletions

synapse/federation/transaction_queue.py
synapse/http/matrixfederationclient.py 11 additions, 11 deletions

synapse/http/matrixfederationclient.py
synapse/state.py 9 additions, 37 deletions

synapse/state.py
synapse/util/__init__.py 0 additions, 2 deletions

synapse/util/__init__.py
synapse/util/expiringcache.py 115 additions, 0 deletions

synapse/util/expiringcache.py

with 214 additions and 57 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