a2feb9bf5b
# Conflicts: # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala # bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala # bigbluebutton-client/branding/default/style/css/V2Theme.css # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf # bigbluebutton-client/locale/en_US/bbbResources.properties # bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as # bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as # bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml # bigbluebutton-html5/private/config/development/server/log.yaml |
||
|---|---|---|
| .. | ||
| conf | ||
| controllers/org/bigbluebutton/web/controllers | ||
| i18n | ||
| services/org/bigbluebutton/web/services | ||
| views | ||