Felipe Cecagno 2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 ... Conflicts: bbb-video/build.gradle bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/locale/de_DE/bbbResources.properties bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-config/web/index.html bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy		2015-01-21 18:11:56 -02:00
..
images	Merge branch '090-encrypted-recording' into mconf-live0.6.2	2015-01-21 18:11:56 -02:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00