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

Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into center-popups 

# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
parents 11438c3e 76f21f79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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