Pedro Beschorner Marin e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 ... Conflicts: bbb-video/build.gradle bbb-voice/build.gradle bigbluebutton-apps/build.gradle bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/build.xml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java deskshare/app/build.gradle deskshare/build.gradle		2016-06-20 16:11:04 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0	2016-06-17 18:00:51 +00:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0	2016-06-20 16:11:04 +00:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00