diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-12 15:06:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-12 15:06:18 +0100 |
| commit | f6fde343a10890e2e8a509e82babb34dd0fbaf06 (patch) | |
| tree | eab85df2d409119042a731667bd1cec1bc70028f /synapse/federation | |
| parent | Remove unused room_id parameter (diff) | |
| parent | Merge pull request #296 from matrix-org/markjh/eventstream_presence (diff) | |
| download | synapse-f6fde343a10890e2e8a509e82babb34dd0fbaf06.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/search
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions