Skip to content
Snippets Groups Projects
Commit cf865ec5 authored by Richard Alam's avatar Richard Alam
Browse files

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 

Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
parents 0dafe99f 646e34c0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 112 additions and 51 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