diff options
| author | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
| commit | c291a4d522afef7449311673b3863db5e484b6e8 (patch) | |
| tree | f69458797cfba50c33448a7953e34f3527158154 /MANIFEST.in | |
| parent | Reset badge count to zero when last active time is bumped (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-c291a4d522afef7449311673b3863db5e484b6e8.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/handlers/events.py synapse/server.py
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions