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

Merge remote-tracking branch 'bigbluebutton/master' into mobile-ui-updates

# Conflicts:
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as
parents 3323da19 1bdb47d5
Loading
Showing
with 312 additions and 105 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