diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:57:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:57:33 +0000 |
| commit | fdd2ac495a6da1bce765fc008e9d9bc114451458 (patch) | |
| tree | 576bc559059b0847d2559f3c5dd00de9cf4bf83f /synapse/app | |
| parent | Be more specific in naming columns in selects. (diff) | |
| parent | Merge pull request #37 from matrix-org/client_v2_filter (diff) | |
| download | synapse-fdd2ac495a6da1bce765fc008e9d9bc114451458.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions