summary refs log tree commit diff
path: root/MAP.rst
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-20 13:45:13 +0000
committerDavid Baker <dave@matrix.org>2016-01-20 13:45:13 +0000
commit2309450a763fc79700c6abe32574c041335531f2 (patch)
tree5a064284d77b9dbcdb92cbbb4967ffa8468fd1d8 /MAP.rst
parentMerge remote-tracking branch 'origin/develop' into push_badge_counts (diff)
parentMerge branch 'dbkr/no_push_for_own_events' into develop (diff)
downloadsynapse-2309450a763fc79700c6abe32574c041335531f2.tar.xz
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'MAP.rst')
0 files changed, 0 insertions, 0 deletions