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

Merge and resolve conflicts

Browse source
This commit is contained in:
Jaiwanth 2021-06-30 12:29:13 +05:30
commit 551639811b
674 changed files with 5275 additions and 5632 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/messages/MVoiceOrAudioBody.tsx
View file

@ -15,9 +15,9 @@ limitations under the License.
*/
import React from "react";
import {MatrixEvent} from "matrix-js-sdk/src/models/event";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import MAudioBody from "./MAudioBody";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import SettingsStore from "../../../settings/SettingsStore";
import MVoiceMessageBody from "./MVoiceMessageBody";