diff options
author | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
commit | eb036256267dc76f13a8a25ab952356e1b1e9c00 (patch) | |
tree | 6d91ca8882e7afc8c5486e28d2e782783b1c85de /setup.cfg | |
parent | comment typo (diff) | |
parent | Merge pull request #463 from matrix-org/daniel/hashtagnofilter (diff) | |
download | synapse-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