Felipe Cecagno 019cfa6cfb Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 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/freeswitch/FreeswitchConferenceActor.scala bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as		2016-01-04 15:14:27 -02:00
..
images	Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf	2016-01-04 15:14:27 -02:00
swf	- add default bbb style	2012-12-27 21:36:05 +00:00