summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:57:33 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:57:33 +0000
commitfdd2ac495a6da1bce765fc008e9d9bc114451458 (patch)
tree576bc559059b0847d2559f3c5dd00de9cf4bf83f /LICENSE
parentBe more specific in naming columns in selects. (diff)
parentMerge pull request #37 from matrix-org/client_v2_filter (diff)
downloadsynapse-fdd2ac495a6da1bce765fc008e9d9bc114451458.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts:
	synapse/storage/__init__.py
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions