Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

16026e60

Commit 16026e60 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse

parents 2ff439cf 0b1a55c6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 9 additions, 0 deletions

CHANGES.rst
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/crypto/keyring.py 17 additions, 10 deletions

synapse/crypto/keyring.py
synapse/rest/client/v2_alpha/account.py 1 addition, 0 deletions

synapse/rest/client/v2_alpha/account.py
synapse/storage/event_federation.py 9 additions, 0 deletions

synapse/storage/event_federation.py
synapse/storage/events.py 2 additions, 0 deletions

synapse/storage/events.py

with 39 additions and 11 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