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

Merge remote-tracking branch 'upstream/develop' into keytar

Browse source
This commit is contained in:
Hubert Chathi 2020-05-28 11:15:36 -04:00
commit 30120dc0c7
273 changed files with 8841 additions and 3619 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Lifecycle.js
View file

@ -26,7 +26,7 @@ import Analytics from './Analytics';
import Notifier from './Notifier';
import UserActivity from './UserActivity';
import Presence from './Presence';
import dis from './dispatcher';
import dis from './dispatcher/dispatcher';
import DMRoomMap from './utils/DMRoomMap';
import Modal from './Modal';
import * as sdk from './index';