summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-05 18:39:50 +0000
committerDavid Baker <dave@matrix.org>2016-01-05 18:39:50 +0000
commiteb036256267dc76f13a8a25ab952356e1b1e9c00 (patch)
tree6d91ca8882e7afc8c5486e28d2e782783b1c85de /setup.cfg
parentcomment typo (diff)
parentMerge pull request #463 from matrix-org/daniel/hashtagnofilter (diff)
downloadsynapse-eb036256267dc76f13a8a25ab952356e1b1e9c00.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions