Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop

2017-09-19 16:36:51 +01:00 · 2017-09-19 16:36:51 +01:00 · 668e096194
parent 7414d4d1f9 d38e950f8b
commit 668e096194
1 changed files with 1 additions and 0 deletions
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@ -20,6 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClient} from 'matrix-js-sdk';
 import UserSettingsStore from '../../../UserSettingsStore';
+import Promise from 'bluebird';

 const BULK_REQUEST_DEBOUNCE_MS = 200;