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
..
core	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2015-12-30 18:35:13 -02:00
endpoint/redis	- try to fix lock settings	2015-09-14 20:18:27 +00:00
Boot.scala	- fix where 2 events are recorded in redis for each voice event.	2015-12-02 21:37:18 +00:00
SystemConfiguration.scala	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00