Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00 · 2021-07-25 08:10:01 +02:00 · b762303102
commit b762303102
parent 2841383e82 869a5fb5c7
181 changed files with 4794 additions and 3252 deletions
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@ -165,7 +165,7 @@ export default class VideoFeed extends React.Component<IProps, IState> {
            else; // TBD

            return (
-                <div className={classnames(videoClasses)} >
+                <div className={classnames(videoClasses)}>
                    <MemberAvatar
                        member={member}
                        height={avatarSize}