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

Merge branch '090-expanded-status' into mconf-live0.6.3

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
parents 7cb12f8b 6e60ae2a
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment