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

..

structures

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

views

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