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
..
core	Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf	2016-01-04 15:14:27 -02:00
matterhorn	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
mconf_decrypter/scripts	changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient)	2015-12-15 16:45:22 -02:00
mconf_encrypted/scripts	changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient)	2015-12-15 16:45:22 -02:00
presentation	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2015-12-30 18:35:13 -02:00
presentation_export	fixed recording size inclusion when processing presentation_export	2015-10-19 17:39:26 -02:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0	2015-11-30 01:06:38 -02:00