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
..
org/bigbluebutton/web/controllers	Merging breakout rooms with the master branch	2016-03-21 17:52:23 +00:00