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

Merge branch '090-download-presentation' into mconf-live0.6.3 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
parents 034cccda e9f48368
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