diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 11:29:46 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 11:29:46 +0100 |
commit | c253b14f6ec4e0efb78bc329f71e63fa3ddb0068 (patch) | |
tree | f29fd33ade7d123324d5db2f29d7a37a1fe4ed0e | |
parent | Merge branch 'develop' into key_distribution (diff) | |
parent | Fix spelling (diff) | |
download | synapse-c253b14f6ec4e0efb78bc329f71e63fa3ddb0068.tar.xz |
Merge branch 'develop' into key_distribution
-rw-r--r-- | synapse/config/registration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py |