Skip to content
Snippets Groups Projects
Commit aa3f8a87 authored by deniszgonjanin's avatar deniszgonjanin
Browse files

Merge branch 'MateRefactoring' 

Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
	bigbluebutton-client/src/ExampleChatModule.mxml
	bigbluebutton-client/src/VideoconfModule.mxml
	bigbluebutton-client/src/conf/config.xml.dev
	bigbluebutton-client/src/conf/join-mock.xml
parents 54ccec0c 5f7d7f7f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 56 additions and 313 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