Ghaz Triki 990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015 ... # 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-02-28 21:34:33 +01:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	Created breakout rooms are now displayed in breakout rooms list.	2016-01-21 20:09:32 +01:00
src	Merge branch 'master' into breakout-rooms-porto-algre-2015	2016-02-28 21:34:33 +01:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Update gson library version to 2.5 for all server projects.	2016-01-27 16:44:22 +01:00