summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 11:04:37 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 11:04:37 +0000
commitc86ebe76736a4cde48cfb3229d894a174c6bd379 (patch)
treeafc236e8ef1bdbd6d0686747b99743661522638e /LICENSE
parentOops, we do want to defer.return regardless of whether we are caching or not (diff)
parentMerge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-c86ebe76736a4cde48cfb3229d894a174c6bd379.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Conflicts:
	synapse/app/homeserver.py
	synapse/state.py
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions