Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist

This commit is contained in:
Michael Telatynski 2018-07-04 11:21:16 +01:00 committed by GitHub
commit 168edbca16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 582 additions and 143 deletions

View file

@ -1306,7 +1306,7 @@ export default React.createClass({
const dft = new DecryptionFailureTracker((total) => {
// TODO: Pass reason for failure as third argument to trackEvent
Analytics.trackEvent('E2E', 'Decryption failure', null, total);
Analytics.trackEvent('E2E', 'Decryption failure', 'unspecified_error', total);
});
// Shelved for later date when we have time to think about persisting history of