diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
| commit | 4429e4bf2499b0b3fecc8637c2a7a932aab908e4 (patch) | |
| tree | 0c17e1767434df9684c3d34263a161ba4fa1d9b9 /MANIFEST.in | |
| parent | Update the end_token correctly, otherwise the token doesn't advance and the c... (diff) | |
| parent | Merge pull request #143 from matrix-org/erikj/SYN-375 (diff) | |
| download | synapse-4429e4bf2499b0b3fecc8637c2a7a932aab908e4.tar.xz | |
Merge branch 'develop' into notifier_unify
Conflicts: synapse/notifier.py
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions