Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

522dada2

Commit 522dada2 authored 6 years ago by Amber Brown

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into develop

parents 8c818af3 ea00f181

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 14 additions, 0 deletions

CHANGES.md
debian/changelog 6 additions, 0 deletions

debian/changelog
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/api/auth.py 27 additions, 38 deletions

synapse/api/auth.py
synapse/config/key.py 2 additions, 2 deletions

synapse/config/key.py
tests/api/test_auth.py 1 addition, 154 deletions

tests/api/test_auth.py

with 51 additions and 195 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