diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-12 20:41:57 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 20:41:57 +1000 |
| commit | bc635026c5dfdbc1937909556be21439c3fcdf50 (patch) | |
| tree | ced4877cf4d23aaf8e088677c832fa8c0a555929 | |
| parent | Port rest/ to Python 3 (#3823) (diff) | |
| parent | changelog (diff) | |
| download | synapse-bc635026c5dfdbc1937909556be21439c3fcdf50.tar.xz | |
Merge pull request #3824 from matrix-org/rav/fix_jwt_import
Fix jwt import check
| -rw-r--r-- | changelog.d/3824.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/config/jwt_config.py (renamed from synapse/config/jwt.py) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3824.bugfix b/changelog.d/3824.bugfix new file mode 100644 index 0000000000..99f199dcc6 --- /dev/null +++ b/changelog.d/3824.bugfix @@ -0,0 +1 @@ +Fix jwt import check \ No newline at end of file diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 2fd9c48abf..b8d5690f2b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -21,7 +21,7 @@ from .consent_config import ConsentConfig from .database import DatabaseConfig from .emailconfig import EmailConfig from .groups import GroupsConfig -from .jwt import JWTConfig +from .jwt_config import JWTConfig from .key import KeyConfig from .logger import LoggingConfig from .metrics import MetricsConfig diff --git a/synapse/config/jwt.py b/synapse/config/jwt_config.py index 51e7f7e003..51e7f7e003 100644 --- a/synapse/config/jwt.py +++ b/synapse/config/jwt_config.py |