diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 11:28:10 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 11:28:10 +0100 |
| commit | b2c2dc8940fc0abe97f0dbfb8c5fa3a4acfe75a8 (patch) | |
| tree | 1e45e884e10bc9c64a0d904df0786f6070a1234b /synapse/appservice | |
| parent | Add a config file for perspective servers (diff) | |
| parent | Call the super classes when generating config (diff) | |
| download | synapse-b2c2dc8940fc0abe97f0dbfb8c5fa3a4acfe75a8.tar.xz | |
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions