-
- Downloads
Merge branch 'master' into lock-settings
Conflicts: bigbluebutton-html5/app/client/views/chat/chat_bar.html bigbluebutton-html5/app/server/user_permissions.coffee
Showing
- README.md 6 additions, 27 deletionsREADME.md
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 4 additions, 0 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 12 additions, 0 deletions...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala 1 addition, 1 deletion.../scala/org/bigbluebutton/core/apps/users/UsersModel.scala
- bigbluebutton-client/locale/am_ET/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/am_ET/bbbResources.properties
- bigbluebutton-client/locale/az_AZ/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/az_AZ/bbbResources.properties
- bigbluebutton-client/locale/bg_BG/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/bg_BG/bbbResources.properties
- bigbluebutton-client/locale/bn_IN/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/bn_IN/bbbResources.properties
- bigbluebutton-client/locale/bs_BA/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/bs_BA/bbbResources.properties
- bigbluebutton-client/locale/ca_ES/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/ca_ES/bbbResources.properties
- bigbluebutton-client/locale/cs_CZ/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/cs_CZ/bbbResources.properties
- bigbluebutton-client/locale/cy_GB/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/cy_GB/bbbResources.properties
- bigbluebutton-client/locale/da_DK/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/da_DK/bbbResources.properties
- bigbluebutton-client/locale/de_DE/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/de_DE/bbbResources.properties
- bigbluebutton-client/locale/el_GR/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/el_GR/bbbResources.properties
- bigbluebutton-client/locale/en_US/bbbResources.properties 3 additions, 2 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/locale/es_419/bbbResources.properties 17 additions, 15 deletionsbigbluebutton-client/locale/es_419/bbbResources.properties
- bigbluebutton-client/locale/es_ES/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/es_ES/bbbResources.properties
- bigbluebutton-client/locale/es_LA/bbbResources.properties 18 additions, 12 deletionsbigbluebutton-client/locale/es_LA/bbbResources.properties
- bigbluebutton-client/locale/et_EE/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/et_EE/bbbResources.properties
Loading
Please register or sign in to comment