Merge branch '090-branding-logo' into mconf-live0.6.1

Browse Source

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml

...

This commit is contained in:

Felipe Cecagno 2014-10-15 16:08:45 -03:00

parent 0037acd648 cbc8cc2885

commit f90e5d78c5

1 changed files with 822 additions and 822 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1644

bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml

View File

File diff suppressed because it is too large Load Diff