Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3
Conflicts: record-and-playback/core/scripts/bigbluebutton.yml
No related branches found
No related tags found
Showing
- bbb-webhooks/hook.coffee 1 addition, 1 deletionbbb-webhooks/hook.coffee
- bigbluebutton-client/branding/default/style/css/BBBDefault.css 2 additions, 6 deletions...uebutton-client/branding/default/style/css/BBBDefault.css
- bigbluebutton-client/locale/am_ET/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/am_ET/bbbResources.properties
- bigbluebutton-client/locale/ar_EG/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/ar_EG/bbbResources.properties
- bigbluebutton-client/locale/ar_SA/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/ar_SA/bbbResources.properties
- bigbluebutton-client/locale/az_AZ/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/az_AZ/bbbResources.properties
- bigbluebutton-client/locale/be_BY/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/be_BY/bbbResources.properties
- bigbluebutton-client/locale/bg_BG/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bg_BG/bbbResources.properties
- bigbluebutton-client/locale/bn_IN/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bn_IN/bbbResources.properties
- bigbluebutton-client/locale/bs_BA/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bs_BA/bbbResources.properties
- bigbluebutton-client/locale/ca_ES/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/ca_ES/bbbResources.properties
- bigbluebutton-client/locale/cs_CZ/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/cs_CZ/bbbResources.properties
- bigbluebutton-client/locale/cy_GB/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/cy_GB/bbbResources.properties
- bigbluebutton-client/locale/da_DK/bbbResources.properties 448 additions, 447 deletionsbigbluebutton-client/locale/da_DK/bbbResources.properties
- bigbluebutton-client/locale/de_DE/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/de_DE/bbbResources.properties
- bigbluebutton-client/locale/el_GR/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/el_GR/bbbResources.properties
- bigbluebutton-client/locale/en_AU/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/en_AU/bbbResources.properties
- bigbluebutton-client/locale/en_US/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/locale/es_419/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/es_419/bbbResources.properties
- bigbluebutton-client/locale/es_CL/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/es_CL/bbbResources.properties
Loading
Please register or sign in to comment