Skip to content
Snippets Groups Projects
Commit c44e5aeb authored by Ghazi Triki's avatar Ghazi Triki
Browse files

Merge remote-tracking branch 'bigbluebutton/master' into v2.0.x-code-cleanup

# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
parents d383fc98 45cd830f
No related branches found
No related tags found
No related merge requests found
Showing
with 243 additions and 617 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