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

Merge branch 'master' into accessibility-improve

# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
parents 290f1620 8904d3ac
No related branches found
No related tags found
No related merge requests found
Showing
with 232 additions and 177 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