Skip to content
Snippets Groups Projects
Commit cf72e091 authored by Gabriel Campes's avatar Gabriel Campes
Browse files

Merge branch 'master' of https://github.com/Gcampes/bigbluebutton 

Conflicts:
	bigbluebutton-html5/app/config.coffee
parents 34f0b22a 93dacb7f
No related branches found
No related tags 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