Felipe Cecagno 2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-config/bin/bbb-conf		2016-01-26 18:33:31 -02:00
..
assets	Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf	2016-01-04 15:14:27 -02:00
org/bigbluebutton/skins	added a configuration warning system to the flash client	2015-01-15 16:14:49 -08:00
BBBBlack.css	cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code	2015-05-17 23:08:41 -03:00
BBBDefault.css	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2016-01-26 18:33:31 -02:00