Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

ed258405

Commit ed258405 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 99515423 977338a7

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/_base.py 29 additions, 18 deletions

synapse/config/_base.py
synapse/federation/federation_client.py 1 addition, 1 deletion

synapse/federation/federation_client.py
synapse/federation/persistence.py 1 addition, 3 deletions

synapse/federation/persistence.py
synapse/storage/_base.py 59 additions, 9 deletions

synapse/storage/_base.py
synapse/storage/event_federation.py 3 additions, 1 deletion

synapse/storage/event_federation.py
synapse/storage/events.py 21 additions, 11 deletions

synapse/storage/events.py
synapse/storage/roommember.py 2 additions, 2 deletions

synapse/storage/roommember.py
synapse/storage/transactions.py 2 additions, 1 deletion

synapse/storage/transactions.py

with 118 additions and 46 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