diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-11-27 14:04:22 -0700 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-11-27 14:04:22 -0700 |
| commit | bc50cffa2698a484dffda0e1f64c832132b1ff48 (patch) | |
| tree | 401ed265c319a277506cb4ddfe9c12bbcb0d4716 /synapse/__init__.py | |
| parent | More timeout (diff) | |
| parent | Support m.login.sso (#4220) (diff) | |
| download | synapse-travis/intentional-timeout.tar.xz | |
Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout
Diffstat (limited to '')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |