Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

0186aef8

Commit 0186aef8 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 0644f0eb e5038489

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MANIFEST.in 2 additions, 0 deletions

MANIFEST.in
jenkins.sh 39 additions, 0 deletions

jenkins.sh
synapse/api/auth.py 10 additions, 8 deletions

synapse/api/auth.py
synapse/config/cas.py 3 additions, 0 deletions

synapse/config/cas.py
synapse/federation/federation_client.py 6 additions, 0 deletions

synapse/federation/federation_client.py
synapse/handlers/auth.py 33 additions, 4 deletions

synapse/handlers/auth.py
synapse/rest/client/v1/login.py 141 additions, 1 deletion

synapse/rest/client/v1/login.py
synapse/rest/client/v1/room.py 14 additions, 3 deletions

synapse/rest/client/v1/room.py
synapse/static/client/login/js/login.js 12 additions, 26 deletions

synapse/static/client/login/js/login.js
tox.ini 5 additions, 3 deletions

tox.ini

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