diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-31 09:49:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-31 09:49:43 +0000 |
| commit | d9a9e9eb300a856a52255f77f40b66d18801153d (patch) | |
| tree | 5731bcf730053af0f688d49e79eaa4f9bfcb47bc /webclient/app.js | |
| parent | Fix bug in redaction auth. (diff) | |
| parent | SYWEB-12: You'll be needing this. (diff) | |
| download | synapse-d9a9e9eb300a856a52255f77f40b66d18801153d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'webclient/app.js')
| -rw-r--r-- | webclient/app.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webclient/app.js b/webclient/app.js |