summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-06-28 10:12:24 +0100
committerGitHub <noreply@github.com>2016-06-28 10:12:24 +0100
commitdb74dcda5b6e0fea3d80635283bcaea6355f3579 (patch)
tree6d97a0e7ac37e7d5f7c2337e7d4ea2b4efa79132 /tox.ini
parentremove vector.im from default secondary DS list (diff)
parentMerge remote-tracking branch 'origin/develop' into dbkr/push_room_naming (diff)
downloadsynapse-db74dcda5b6e0fea3d80635283bcaea6355f3579.tar.xz
Merge pull request #894 from matrix-org/dbkr/push_room_naming
Use similar naming we use in email notifs for push
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions