summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-16 15:18:42 +0100
committerErik Johnston <erik@matrix.org>2015-10-16 15:18:42 +0100
commit23ed7dc0e711891cff62ca362eb7fbfd5782c68d (patch)
tree10e885b6149118268287c6933dfd02f6328ae204 /synapse/server.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/search (diff)
parentMerge pull request #309 from matrix-org/erikj/_filter_events_for_client (diff)
downloadsynapse-23ed7dc0e711891cff62ca362eb7fbfd5782c68d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions