Merge pull request #1 from antobinary/merge-pr
Resolve conflicts with master + fix hiredis warning
Showing
- bigbluebutton-html5/imports/locales/en.json 14 additions, 7 deletionsbigbluebutton-html5/imports/locales/en.json
- bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx 97 additions, 0 deletions.../ui/components/actions-bar/actions-dropdown/component.jsx
- bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx 3 additions, 8 deletions...ton-html5/imports/ui/components/actions-bar/component.jsx
- bigbluebutton-html5/imports/ui/components/dropdown/component.jsx 1 addition, 0 deletions...button-html5/imports/ui/components/dropdown/component.jsx
- bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx 45 additions, 15 deletions...rts/ui/components/nav-bar/settings-dropdown/component.jsx
- bigbluebutton-html5/package.json 1 addition, 0 deletionsbigbluebutton-html5/package.json
Loading
Please register or sign in to comment