Felipe Cecagno ed366e6b21 Merge branch '090-recordings-size' into mconf-live0.7.3 ... Conflicts: bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java		2015-09-08 17:43:20 -03:00
..
playback/presentation	Merge branch '090-mconf-branding' into HEAD	2015-01-25 11:59:45 -02:00
scripts	refactored part of the bbb-0.9-recording-size code in order to include the size on the download size for mconf_encrypted and the playback size for the others; included raw_size for all available formats	2015-09-08 17:18:02 -03:00