Felipe Cecagno 6d12e362bd Merge branch 'mconf-live0.6.3' of github.com:mconf/bigbluebutton into mconf-live0.6.3 ... Conflicts: bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java		2015-05-18 10:18:07 -03:00
..
java/org/bigbluebutton/app/video	Merge branch 'mconf-live0.6.3' of github.com:mconf/bigbluebutton into mconf-live0.6.3	2015-05-18 10:18:07 -03:00
resources	- change format of logs to add timezone	2015-02-09 18:40:31 +00:00
webapp	Relay disconnection timeout is configurable now	2014-07-01 17:59:50 -03:00