Felipe Cecagno dd97b8f80c Merge branch 'encrypted-recording' into 090-encrypted-recording ... Conflicts: bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java		2014-09-01 16:46:03 -03:00
..
features	copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb	2013-02-04 15:34:54 -02:00
god	copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb	2013-02-04 15:34:54 -02:00
lib	Merge branch 'encrypted-recording' into 090-encrypted-recording	2014-09-01 16:46:03 -03:00
resources/raw	- extract metadata from events.xml and generate index.html in publish dir for simple playback	2011-05-24 18:16:54 -04:00
scripts	Merge pull request #348 from speakserve/unify-version-number	2014-08-13 14:17:45 -04:00
spec	copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb	2013-02-04 15:34:54 -02:00
Gemfile	included the fastimage gem to the record and playback Gemfile	2013-02-22 22:17:53 -03:00
Gemfile.lock	- update SystemTimer to 1.2.3	2011-05-27 19:45:05 -04:00