Felipe Cecagno 8e12c909c5 Merge branch '090-encrypted-recording' into HEAD ... Conflicts: bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java record-and-playback/core/Gemfile record-and-playback/deploy.sh		2015-01-21 15:51:29 -02:00
..
bbb-conf	Merge branch 'bbb-conf-fix' of https://github.com/ffdixon/bigbluebutton into ffdixon-bbb-conf-fix	2014-11-27 14:47:43 -05:00
bbb-record	cleanup	2014-09-01 17:53:57 -03:00