Skip to content
Snippets Groups Projects
Commit dd97b8f8 authored by Felipe Cecagno's avatar Felipe Cecagno
Browse files

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
parents 44236df1 51e29743
No related branches found
No related tags found
Loading
Showing
with 684 additions and 19 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment