bigbluebutton-Github/bbb-common-message
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 - create a common message project 2015-06-10 15:53:07 +00:00
src Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 2016-06-27 19:57:48 +00:00
.gitignore - create a common message project 2015-06-10 15:53:07 +00: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
README.md - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00