summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-06 11:51:27 +0100
committerErik Johnston <erik@matrix.org>2016-06-06 11:51:27 +0100
commit6882231f7888a973955f18041ec3df80430a3f48 (patch)
treeeeabae5ba3954ae9e9f45ae0b6b6236589aff225 /synapse/api/auth.py
parentMerge remote-tracking branch 'origin/develop' into erikj/timings (diff)
parentMerge pull request #836 from matrix-org/erikj/change_event_cache (diff)
downloadsynapse-6882231f7888a973955f18041ec3df80430a3f48.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings
Diffstat (limited to 'synapse/api/auth.py')
0 files changed, 0 insertions, 0 deletions