diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-24 15:51:59 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-24 15:51:59 +0000 |
commit | 08e25ffa0cbbaee0a092f95648b4529ff081d56f (patch) | |
tree | 193be1b1dd6f0c7d628ee99b14cfec413685b9f9 /synapse/app/__init__.py | |
parent | Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix (diff) | |
download | synapse-08e25ffa0cbbaee0a092f95648b4529ff081d56f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/__init__.py')
0 files changed, 0 insertions, 0 deletions