summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-02 17:20:56 +0100
committerDavid Baker <dave@matrix.org>2016-06-02 17:20:56 +0100
commitc71177f285fc21cef48912e138956a7b10f57f9e (patch)
treec8ee989d97e041b98c7f2d21f8dfadaa9457d6b7 /synapse/app
parentMerge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe (diff)
parentFix error in email notification string formatting (diff)
downloadsynapse-c71177f285fc21cef48912e138956a7b10f57f9e.tar.xz
Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions