Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

81391fa1

Commit 81391fa1 authored 7 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 1e4edd17 5f23b6d5

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 43 additions, 0 deletions

CHANGES.rst
README.rst 5 additions, 0 deletions

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

synapse/__init__.py
synapse/handlers/auth.py 16 additions, 8 deletions

synapse/handlers/auth.py
synapse/handlers/groups_local.py 4 additions, 3 deletions

synapse/handlers/groups_local.py
synapse/handlers/register.py 1 addition, 1 deletion

synapse/handlers/register.py
synapse/handlers/set_password.py 1 addition, 1 deletion

synapse/handlers/set_password.py
synapse/http/server.py 19 additions, 11 deletions

synapse/http/server.py
synapse/rest/client/v1/room.py 26 additions, 3 deletions

synapse/rest/client/v1/room.py

with 116 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