Pedro Beschorner Marin 85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as		2016-06-27 19:57:48 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
src	Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0	2016-06-27 19:57:48 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	- make the flash client not attempt to reconnect when the user has been ejected from the meeting.	2016-01-19 16:16:12 +00:00