diff options
author | Erik Johnston <erik@matrix.org> | 2014-11-03 10:17:37 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-11-03 10:17:37 +0000 |
commit | 7a07263281c89f199aa2ee8a1c9e602e7a5b1218 (patch) | |
tree | 4fb96db62c91009db5928a31570107ad29841b61 /webclient/app.js | |
parent | Sign evnets (diff) | |
parent | Use python logger, not the twisted logger (diff) | |
download | synapse-7a07263281c89f199aa2ee8a1c9e602e7a5b1218.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js |