7fe44355d4
Merge breakout rooms feature with master branch. This also includes closed captioning feature. Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-web/.classpath bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
10 lines
95 B
Plaintext
Executable File
10 lines
95 B
Plaintext
Executable File
.project
|
|
*.war
|
|
stacktrace.log
|
|
lib
|
|
web-app/demo/bbb_api_conf.jsp
|
|
target/*
|
|
bin/*
|
|
plugins/*
|
|
/bin/
|