diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-06 14:23:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-06 14:23:41 +0000 |
| commit | c54773473f26ff2c56b4f8ac3e428077757a9724 (patch) | |
| tree | 1df40ba03f5b996ad44a3710ba7efa991747a642 /synapse/server.py | |
| parent | Merge pull request #96 from matrix-org/pushrules2 (diff) | |
| parent | Merge pull request #98 from matrix-org/hotfixes-v0.7.1-r4 (diff) | |
| download | synapse-c54773473f26ff2c56b4f8ac3e428077757a9724.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions