diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
commit | eede182df75d0c0b6064af016a06c2758ae217d0 (patch) | |
tree | 4d4eb13dd3ab020032394f8282c85f4e3c2782e8 /synapse/storage/appservice.py | |
parent | Move the key related config parser into a separate file (diff) | |
parent | Copyright notices (diff) | |
download | synapse-eede182df75d0c0b6064af016a06c2758ae217d0.tar.xz |
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/storage/appservice.py')
0 files changed, 0 insertions, 0 deletions