diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-22 13:02:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-22 13:02:47 +0100 |
| commit | e68dc04900e49d6a86dfcc41c0be33ede02366c8 (patch) | |
| tree | 63998d3db3dc7e676e119f7557a1dbd227900a52 | |
| parent | Propagate failure reason to the other party. (diff) | |
| parent | Fix undefined variable error (diff) | |
| download | synapse-e68dc04900e49d6a86dfcc41c0be33ede02366c8.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 1 | ||||
| -rw-r--r-- | webclient/components/matrix/matrix-call.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 9e884e51bf..dd188cf86a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -41,7 +41,6 @@ Webclient: * The recents list now differentiates between public & private rooms. * Fix bug where when switching between rooms the pagination flickered before the view jumped to the bottom of the screen. - * Add support for password resets. * Add bing word support. Registration API: diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js index 9d3a787291..7b5d9cffef 100644 --- a/webclient/components/matrix/matrix-call.js +++ b/webclient/components/matrix/matrix-call.js @@ -537,7 +537,7 @@ angular.module('MatrixCall', []) } if (this.candidateSendTries > 5) { - console.log("Failed to send candidates on attempt "+ev.tries+". Giving up for now."); + console.log("Failed to send candidates on attempt "+this.candidateSendTries+". Giving up for now."); this.candidateSendTries = 0; return; } |