summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
commitbd84755e64a5fd086738a43e049885604ea53927 (patch)
tree39b3bf10a5b074c82e48a723670a539b9149a8ee /synapse/appservice
parentPull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions