Skip to content
Snippets Groups Projects
Commit 0a1c74ce authored by Chad Pilkey's avatar Chad Pilkey
Browse files

Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
parents c96e78d8 b895316b
No related branches found
No related tags found
No related merge requests found
Showing
with 351 additions and 151 deletions
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