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

Merge branch 'issue-257' into mconf-live0.7.5

Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
parents 43082d04 78fb3583
No related branches found
No related tags found
Loading
Showing
with 124 additions and 15 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