diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
| commit | 73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch) | |
| tree | 268463223a4dbed35244b83ffb7b767330f8416e /synapse/config/appservice.py | |
| parent | update logger to match new ambiguous script name... (diff) | |
| parent | DEPENDENCY_LINKS was turned to a list (diff) | |
| download | synapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz | |
Merge branch 'master' into develop
Conflicts: setup.py
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions