summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2016-06-03 12:15:01 +0100
committerMatthew Hodgson <matthew@arasphere.net>2016-06-03 12:15:01 +0100
commitaa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8 (patch)
tree5034a5aba0c6e604683080357ae6481803a4dea1 /res
parentMerge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop (diff)
parentMerge branch 'develop' into matthew/brand-from-header (diff)
downloadsynapse-aa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8.tar.xz
Merge pull request #822 from matrix-org/matthew/brand-from-header
brand the email from header
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions