diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:40:22 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:40:22 +0000 |
| commit | 2a0ec3b89d6b97e8a91ef5320d5e6675acacffdd (patch) | |
| tree | bc022d01b40c2fdc701d4e1183931217cb6dfd6f /synapse/server.py | |
| parent | Only fire user_joined_room if the membership has changed (diff) | |
| parent | Merge pull request #409 from MadsRC/develop (diff) | |
| download | synapse-2a0ec3b89d6b97e8a91ef5320d5e6675acacffdd.tar.xz | |
Merge branch 'develop' into markjh/edu_frequency
Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions