Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

b578c822

Commit b578c822 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0

parents d5c31e01 3befc9cc

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/constants.py 1 addition, 0 deletions

synapse/api/constants.py
synapse/handlers/auth.py 1 addition, 1 deletion

synapse/handlers/auth.py
synapse/handlers/room.py 3 additions, 2 deletions

synapse/handlers/room.py
synapse/rest/client/v2_alpha/account.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/account.py

with 6 additions and 4 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