3db4ead6e4
Conflicts: bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml |
||
---|---|---|
.. | ||
core | ||
matterhorn | ||
presentation | ||
slides | ||
changelog.md | ||
deploy.sh |