Merge branch 'master' into vector

This commit is contained in:
David Baker 2015-07-16 16:13:24 +01:00
commit 50edc619af
2 changed files with 12 additions and 7 deletions

View file

@ -78,9 +78,9 @@ module.exports = {
logged_in: false,
ready: false
});
localStorage.removeItem("mx_hs_url");
localStorage.removeItem("mx_user_id");
localStorage.removeItem("mx_access_token");
if (window.localStorage) {
window.localStorage.clear();
}
Notifier.stop();
MatrixClientPeg.get().removeAllListeners();
MatrixClientPeg.replace(null);