summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-11-09 15:01:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-11-09 15:01:59 +0000
commitbbe10e8be7fa900c37e525d791e5a344ad34f165 (patch)
tree02aba4e8638e248f4452fbde91963ca01e02cc50 /tox.ini
parentSYN-513: Include updates for rooms that have had all their tags deleted (diff)
parentfix comedy important missing comma breaking recent-ordered FTS on sqlite (diff)
downloadsynapse-bbe10e8be7fa900c37e525d791e5a344ad34f165.tar.xz
Merge branch 'develop' into markjh/SYN-513
Conflicts:
	synapse/storage/tags.py
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions