diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
| commit | ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045 (patch) | |
| tree | 2dddf9f52591a392295bbace7a9494ab423c7cfd /synapse/rest/__init__.py | |
| parent | Hook up the push rules stream to account_data in /sync (diff) | |
| parent | Merge pull request #598 from Rugvip/invite-state (diff) | |
| download | synapse-ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045.tar.xz | |
Merge branch 'develop' into markjh/pushrule_stream
Diffstat (limited to 'synapse/rest/__init__.py')
0 files changed, 0 insertions, 0 deletions