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

Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving

Browse source 
 Conflicts:
	src/components/views/rooms/RoomList.js
This commit is contained in:
Michael Telatynski 2020-01-16 00:31:43 +00:00
commit e6ab18c9ba
466 changed files with 4509 additions and 4321 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/RoomSubList.js
View file

@ -19,9 +19,9 @@ limitations under the License.
import React, {createRef} from 'react';
import classNames from 'classnames';
import sdk from '../../index';
import * as sdk from '../../index';
import dis from '../../dispatcher';
import Unread from '../../Unread';
import * as Unread from '../../Unread';
import * as RoomNotifs from '../../RoomNotifs';
import * as FormattingUtils from '../../utils/FormattingUtils';
import IndicatorScrollbar from './IndicatorScrollbar';