Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

27d099ed

Commit 27d099ed authored 5 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1

parents 2e7fad87 bbeee33d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/6910.bugfix 1 addition, 0 deletions

changelog.d/6910.bugfix
synapse/rest/admin/users.py 2 additions, 4 deletions

synapse/rest/admin/users.py
synapse/storage/data_stores/main/registration.py 10 additions, 6 deletions

synapse/storage/data_stores/main/registration.py
tests/rest/admin/test_user.py 181 additions, 28 deletions

tests/rest/admin/test_user.py

with 194 additions and 38 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