Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

9e2601f8

Unverified Commit 9e2601f8 authored 6 years ago by Richard van der Hoff Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3108 from NotAFile/py3-six-urlparse

Use six.moves.urlparse

parents 95582367 2a3c33ff

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/appservice.py 2 additions, 2 deletions

synapse/config/appservice.py
synapse/http/matrixfederationclient.py 1 addition, 2 deletions

synapse/http/matrixfederationclient.py
synapse/rest/client/v1/login.py 1 addition, 1 deletion

synapse/rest/client/v1/login.py
synapse/rest/client/v1/room.py 5 additions, 4 deletions

synapse/rest/client/v1/room.py
synapse/rest/media/v1/_base.py 1 addition, 1 deletion

synapse/rest/media/v1/_base.py
synapse/rest/media/v1/media_repository.py 1 addition, 1 deletion

synapse/rest/media/v1/media_repository.py
tests/rest/client/v1/test_rooms.py 7 additions, 7 deletions

tests/rest/client/v1/test_rooms.py
tests/utils.py 2 additions, 3 deletions

tests/utils.py

with 20 additions and 21 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