Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
Showing
- akka-bbb-apps/build.sbt 2 additions, 0 deletionsakka-bbb-apps/build.sbt
- akka-bbb-apps/run.sh 6 additions, 1 deletionakka-bbb-apps/run.sh
- akka-bbb-apps/src/main/resources/application.conf 0 additions, 93 deletionsakka-bbb-apps/src/main/resources/application.conf
- akka-bbb-apps/src/main/resources/logback.xml 0 additions, 30 deletionsakka-bbb-apps/src/main/resources/logback.xml
- akka-bbb-apps/src/universal/conf/application.ini 0 additions, 42 deletionsakka-bbb-apps/src/universal/conf/application.ini
- bigbluebutton-html5/.meteor/.finished-upgraders 1 addition, 0 deletionsbigbluebutton-html5/.meteor/.finished-upgraders
- bigbluebutton-html5/.meteor/packages 23 additions, 19 deletionsbigbluebutton-html5/.meteor/packages
- bigbluebutton-html5/.meteor/release 1 addition, 1 deletionbigbluebutton-html5/.meteor/release
- bigbluebutton-html5/.meteor/versions 61 additions, 73 deletionsbigbluebutton-html5/.meteor/versions
- bigbluebutton-html5/imports/startup/client/base.jsx 1 addition, 2 deletionsbigbluebutton-html5/imports/startup/client/base.jsx
- bigbluebutton-html5/imports/startup/client/intl.jsx 2 additions, 1 deletionbigbluebutton-html5/imports/startup/client/intl.jsx
- bigbluebutton-html5/imports/startup/server/logger.js 8 additions, 15 deletionsbigbluebutton-html5/imports/startup/server/logger.js
- bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx 38 additions, 30 deletions.../ui/components/actions-bar/actions-dropdown/component.jsx
- bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx 17 additions, 18 deletions.../imports/ui/components/audio/audio-controls/container.jsx
- bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx 3 additions, 0 deletions...imports/ui/components/authenticated-handler/component.jsx
- bigbluebutton-html5/imports/ui/components/button/component.jsx 1 addition, 5 deletions...uebutton-html5/imports/ui/components/button/component.jsx
- bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx 1 addition, 1 deletion...l5/imports/ui/components/chat/chat-dropdown/component.jsx
- bigbluebutton-html5/imports/ui/components/chat/message-list/component.jsx 3 additions, 4 deletions...ml5/imports/ui/components/chat/message-list/component.jsx
- bigbluebutton-html5/imports/ui/components/checkbox/component.jsx 4 additions, 4 deletions...button-html5/imports/ui/components/checkbox/component.jsx
- bigbluebutton-html5/imports/ui/components/closed-captions/service.js 1 addition, 0 deletions...on-html5/imports/ui/components/closed-captions/service.js
Loading
Please register or sign in to comment