add missing prop from merge

2019-04-11 21:12:54 +00:00 · 2019-04-11 21:12:54 +00:00 · 1e76a117cf
commit 1e76a117cf
parent a28acaee4a
2 changed files with 2 additions and 1 deletions
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@ -92,6 +92,7 @@ class Base extends Component {
      approved,
      meetingExist,
      animations,
+      ejected,
      meteorIsConnected,
      subscriptionsReady,
    } = this.props;
--- a/bigbluebutton-html5/imports/ui/stylesheets/variables/general.scss
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/general.scss
@ -26,4 +26,4 @@
  --indicator-padding-bottom: 0.7em;

  --user-indicators-offset: -5px;
-}
+}