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

Merge remote-tracking branch 'bigbluebutton/master' into mobile-listen-only 

# Conflicts:
#	clients/flash/air-client/src/css/xhdpi.css
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediatorAIR.as
#	clients/flash/air-client/src/org/bigbluebutton/air/voice/VoiceConfig.as
#	clients/flash/air-client/src/org/bigbluebutton/air/voice/views/EchoTestViewMediatorAIR.as
parents cfd26207 1dd942e2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 64 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net