Skip to content
Snippets Groups Projects
Commit 4ecf1ea1 authored by Maxim Khlobystov's avatar Maxim Khlobystov
Browse files

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into...

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view

Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
parents 5be21ee8 ebd98168
No related branches found
No related tags found
Loading
Showing
with 224 additions and 211 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