Richard Alam 839473395a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java		2015-08-07 15:06:40 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
src	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes	2015-08-07 15:06:40 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	- add number of responders on poll result	2015-07-13 19:18:37 +00:00