imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button

Browse source
This commit is contained in:
Travis Ralston 2020-01-16 13:36:59 -07:00
commit 372861c9df
475 changed files with 4911 additions and 4391 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/utils/DMRoomMap.js
View file

@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import MatrixClientPeg from '../MatrixClientPeg';
import {MatrixClientPeg} from '../MatrixClientPeg';
import _uniq from 'lodash/uniq';
import {Room} from "matrix-js-sdk/lib/matrix";
import {Room} from "matrix-js-sdk/src/matrix";
/**
* Class that takes a Matrix Client and flips the m.direct map