diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:35:05 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:35:05 +0000 |
commit | 0b700233737adfa3c6558e988822e7f9ee31ca39 (patch) | |
tree | eac8aff9fb9f58da245c9c3e7a80fa13ac5e1eb1 /synapse/handlers/directory.py | |
parent | Merge remote-tracking branch 'origin' into typing_notifications (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-0b700233737adfa3c6558e988822e7f9ee31ca39.tar.xz |
Merge branch 'develop' into typing_notifications
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions