diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-03-19 10:37:50 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-03-19 10:37:50 +0000 |
commit | d2a537ea605b50a34cbf234d140f9a7edfeb9785 (patch) | |
tree | 04baa6a2c9e995fe422107c179616e492b355da0 /synapse/crypto/context_factory.py | |
parent | Comment out most options in the generated config. (#4863) (diff) | |
parent | Repoint docs for federation (#4881) (diff) | |
download | synapse-d2a537ea605b50a34cbf234d140f9a7edfeb9785.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/crypto/context_factory.py')
0 files changed, 0 insertions, 0 deletions