Michael Telatynski 5c172a383d Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird ... Conflicts: src/components/views/right_panel/UserInfo.js		2019-11-18 10:36:43 +00:00
..
ForgotPassword.js	Rip out the remainder of Bluebird	2019-11-18 10:03:05 +00:00
Login.js	Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird	2019-11-18 10:36:43 +00:00
PostRegistration.js	Rip out the remainder of Bluebird	2019-11-18 10:03:05 +00:00
Registration.js	Rip out the remainder of Bluebird	2019-11-18 10:03:05 +00:00
SoftLogout.js	Remove misleading text about admins logging people out from soft logout	2019-07-11 09:18:33 -06:00