diff options
author | David Baker <dave@matrix.org> | 2016-01-20 13:40:22 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-20 13:40:22 +0000 |
commit | 7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e (patch) | |
tree | 77dee2daedba4a17ab6bebd3e0ca343a217635a3 /tox.ini | |
parent | Merge branch 'develop' into push_badge_counts (diff) | |
parent | Merge pull request #511 from matrix-org/dbkr/no_push_for_own_events (diff) | |
download | synapse-7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e.tar.xz |
Merge remote-tracking branch 'origin/develop' into push_badge_counts
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions