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

Merge remote-tracking branch 'RafaFP/fix-1822' into mconf-live0.7.5 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
parents fa18948c 60bc3b1a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 23 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