Felipe Cecagno 8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js		2015-12-30 18:35:13 -02:00
..
bin	Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge	2015-11-25 15:58:36 +00:00
cron.daily	Added commands to clean out FreeSWITCH logs after a number of days	2015-11-03 18:00:23 -05:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
slides	moving these configuration files into git	2010-09-18 23:24:04 +00:00
web	Update index.html	2015-10-05 11:44:47 -04:00
bigbluebutton-release	bump from 1.0.0-dev to 1.0.0-beta	2015-09-23 18:00:16 -04:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00