diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-24 10:38:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-24 10:38:21 +0100 |
| commit | 86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2 (patch) | |
| tree | 50909a17ae7cc6b26f3b70d2286aa43d9418bbf9 /res | |
| parent | Add None checks to backfill (diff) | |
| parent | Merge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff) | |
| download | synapse-86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions