diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
| commit | 3eb45eba0e387dacb67158efe323f19731799c79 (patch) | |
| tree | 79d942de91b8c9a940e787da9b4a329047139a80 /webclient/app.js | |
| parent | Add store for server certificates and keys (diff) | |
| parent | Add config tree to synapse. Add support for reading config from a file (diff) | |
| download | synapse-3eb45eba0e387dacb67158efe323f19731799c79.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'webclient/app.js')
| -rw-r--r-- | webclient/app.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js |