diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
| commit | 2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch) | |
| tree | 23710ca7b15e7d65eee8885a04b23a829ca00379 /synctl | |
| parent | Update the current state of an event if we update auth events. (diff) | |
| parent | Include content in notification pokes (diff) | |
| download | synapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synctl')
0 files changed, 0 insertions, 0 deletions