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

Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf 

Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
parents d5d28e7d c2a2b7c8
No related branches found
No related tags found
No related merge requests 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