diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-13 10:09:55 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-13 10:09:55 +0000 |
commit | 74626a8de42e7fc8cf18e58872f77792247df6af (patch) | |
tree | 84c3224615f2683a9673509f7c03e4b75d91ff32 /synapse/config | |
parent | Reindent code to be less human-readable to keep pep8 from complaining (diff) | |
parent | Reindent code to be less human-readable to keep pep8 from complaining (diff) | |
download | synapse-74626a8de42e7fc8cf18e58872f77792247df6af.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions