Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

e25e0f4d

Commit e25e0f4d authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 42b972bc 7367ca42

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/config/homeserver.py 2 additions, 1 deletion

synapse/config/homeserver.py
synapse/config/registration.py 33 additions, 0 deletions

synapse/config/registration.py
synapse/handlers/federation.py 1 addition, 1 deletion

synapse/handlers/federation.py
synapse/rest/client/v1/register.py 6 additions, 0 deletions

synapse/rest/client/v1/register.py
tests/rest/client/v1/test_events.py 1 addition, 0 deletions

tests/rest/client/v1/test_events.py
tests/utils.py 1 addition, 0 deletions

tests/utils.py

with 45 additions and 3 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