summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-23 11:17:48 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-23 11:17:48 +0100
commit05f1a4596a929930c6a4aca11133533f56030688 (patch)
tree9055c7a1731dca915a5f440d2d755450354ac2e1 /synapse/util
parentMerge pull request #892 from matrix-org/dbkr/email_notif_most_recent (diff)
parentMerge pull request #889 from matrix-org/markjh/synctl_workers (diff)
downloadsynapse-05f1a4596a929930c6a4aca11133533f56030688.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions