diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-17 15:53:59 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-17 15:53:59 +0000 |
| commit | 7e90fb6a5728d223c6597f19194188a9f1e438ad (patch) | |
| tree | 7d0ce13361eb03526251fdfe4dc32ed3d6ab5104 /synapse/server.py | |
| parent | Some cleanup (diff) | |
| parent | Merge pull request #580 from Rugvip/develop (diff) | |
| download | synapse-7e90fb6a5728d223c6597f19194188a9f1e438ad.tar.xz | |
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts: synapse/rest/client/v1/room.py
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions