diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
| commit | 1cfda3d2d8f0f63099c0176b4e01907aba7ad804 (patch) | |
| tree | 7691812e7aa296267978d375d006ff8a1bf66aa1 /synapse/config/appservice.py | |
| parent | Simplify code (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-1cfda3d2d8f0f63099c0176b4e01907aba7ad804.tar.xz | |
Merge branch 'develop' into daniel/forgetrooms
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions