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

Merge branch 'master' into merge-polling-with-master 

Conflicts:
	bigbluebutton-config/bin/bbb-conf
parents 9998ea3d a79e224f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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