diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-08 14:43:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-08 14:43:49 +0000 |
| commit | e6651e804693edd575370157ab3fef08d6952186 (patch) | |
| tree | 5eec467445186c011b2c1a6f083d9d852f51f869 /synapse/server.py | |
| parent | Merge pull request #1615 from matrix-org/erikj/limit_prev_events (diff) | |
| parent | Merge branch 'erikj/ldap3_auth' (diff) | |
| download | synapse-e6651e804693edd575370157ab3fef08d6952186.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