Ghazi Triki a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 ... # 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		2018-01-23 12:27:42 +01:00
..
index.js	revert env	2018-01-11 10:48:24 -02:00
logger.js	Linting	2018-01-07 16:25:56 -08:00
redis.js	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0	2018-01-23 12:27:42 +01:00