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

Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5

Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
parents 6ab5feb1 e7448cf9
No related branches found
No related tags found
No related merge requests found
Showing
with 605 additions and 289 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