Felipe Cecagno 66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' 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/resources/prod/bbb-deskshare-applet-0.9.0.jar bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy		2016-03-02 00:19:30 -03:00
..
groovy/org/bigbluebutton	Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf	2016-03-02 00:19:30 -03:00
java/org/bigbluebutton	Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf	2016-03-02 00:19:30 -03:00