Skip to content
Snippets Groups Projects
Commit 0b268404 authored by Felipe Cecagno's avatar Felipe Cecagno
Browse files

Merge remote-tracking branch 'RafaFP/feature-1851' into mconf-live0.7.5 

Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
parents f0fd4de8 c3498465
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 5 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