bigbluebutton-Github/bbb-api-demo
Richard Alam 7fe44355d4 Merging breakout rooms with the master branch
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
2016-03-21 17:52:23 +00:00
..
src/main/webapp Merging breakout rooms with the master branch 2016-03-21 17:52:23 +00:00
.gitignore fixed problem with demo10 2011-11-17 10:32:15 -08:00
build.gradle After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
demo.nginx Add configuration for nginx for breaking out API demos into their own package 2011-07-03 12:17:58 -07:00
pom.xml After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
README Remove target folder 2011-06-17 18:12:31 +00:00

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