diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-07 21:45:38 +1000 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-07 21:45:38 +1000 |
commit | 771d213ac5b66aaa7dcfc97f29a4e08d9e298150 (patch) | |
tree | 1788b096d4ebe52a4e69e926e1a64b602f40101e /synapse/config/homeserver.py | |
parent | Port tests/ to Python 3 (#3808) (diff) | |
parent | changelog (diff) | |
download | synapse-771d213ac5b66aaa7dcfc97f29a4e08d9e298150.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/homeserver.py')
0 files changed, 0 insertions, 0 deletions