diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
commit | c1f0a5636c9df647209794661627668547ce929a (patch) | |
tree | 464db1ef298b1f110c5ea1003ef1ed019000ab41 /synapse/config/__init__.py | |
parent | add changelog file (diff) | |
parent | Merge pull request #5793 from matrix-org/erikj/fix_bg_update (diff) | |
download | synapse-c1f0a5636c9df647209794661627668547ce929a.tar.xz |
Merge branch 'develop' into cross-signing_hidden
Diffstat (limited to 'synapse/config/__init__.py')
0 files changed, 0 insertions, 0 deletions