Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

f8b86526

Commit f8b86526 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into key_distribution

Conflicts:
	synapse/crypto/keyring.py

parents 28870217 1c1d67df

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

README.rst 11 additions, 6 deletions

README.rst
synapse/crypto/keyring.py 20 additions, 0 deletions

synapse/crypto/keyring.py
synapse/push/baserules.py 21 additions, 21 deletions

synapse/push/baserules.py
synapse/rest/media/v1/base_resource.py 3 additions, 1 deletion

synapse/rest/media/v1/base_resource.py
synapse/util/async.py 19 additions, 0 deletions

synapse/util/async.py

with 74 additions and 28 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