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

Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message

# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
parents 6e336fa3 9e623fde
No related branches found
No related tags found
Loading
Showing
with 379 additions and 50 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