diff options
author | David Baker <dave@matrix.org> | 2015-01-28 16:03:35 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2015-01-28 16:03:35 +0000 |
commit | 6840e7ceced60e2b71f6e2ee3df6ba201000332b (patch) | |
tree | 20c5fbb04af37045cd70a70197414943d87d0578 /setup.cfg | |
parent | Move pushers delta to v12 and bump schema version (diff) | |
parent | Add matrix.org as a trusted ID server because it's now passed through on port... (diff) | |
download | synapse-6840e7ceced60e2b71f6e2ee3df6ba201000332b.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions