Skip to content
Snippets Groups Projects
Commit d402f7b3 authored by Richard Alam's avatar Richard Alam
Browse files

Merge branch 'master' 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
parents dc181437 6b954488
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3584 additions and 3133 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