diff options
author | David Baker <dave@matrix.org> | 2016-01-20 13:45:13 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-20 13:45:13 +0000 |
commit | 2309450a763fc79700c6abe32574c041335531f2 (patch) | |
tree | 5a064284d77b9dbcdb92cbbb4967ffa8468fd1d8 /tox.ini | |
parent | Merge remote-tracking branch 'origin/develop' into push_badge_counts (diff) | |
parent | Merge branch 'dbkr/no_push_for_own_events' into develop (diff) | |
download | synapse-2309450a763fc79700c6abe32574c041335531f2.tar.xz |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions