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 |
||
---|---|---|
.. | ||
src/main/webapp | ||
.gitignore | ||
build.gradle | ||
demo.nginx | ||
pom.xml | ||
README |
Steps: gradle resolveDeps gradle build sudo rm -rf /var/lib/tomcat6/webapps/demo* sudo cp build/libs/demo.war /var/lib/tomcat6/webapps/ sudo service tomcat6 restart