Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
This commit is contained in:
commit
4e5680de85
630 changed files with 14691 additions and 3992 deletions
|
@ -15,7 +15,7 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import React from 'react';
|
||||
import dis from '../../../dispatcher';
|
||||
import dis from '../../../dispatcher/dispatcher';
|
||||
import * as sdk from '../../../index';
|
||||
import { _t } from '../../../languageHandler';
|
||||
import RoomViewStore from '../../../stores/RoomViewStore';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue