summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-20 13:40:22 +0000
committerDavid Baker <dave@matrix.org>2016-01-20 13:40:22 +0000
commit7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e (patch)
tree77dee2daedba4a17ab6bebd3e0ca343a217635a3 /synapse/util
parentMerge branch 'develop' into push_badge_counts (diff)
parentMerge pull request #511 from matrix-org/dbkr/no_push_for_own_events (diff)
downloadsynapse-7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e.tar.xz
Merge remote-tracking branch 'origin/develop' into push_badge_counts
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions