cfd3446123
Conflicts: README bigbluebutton-client/.gitignore bigbluebutton-client/resources/prod/BigBlueButton.html bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml bigbluebutton-web/grails-app/conf/bigbluebutton.properties
15 lines
250 B
Plaintext
Executable File
15 lines
250 B
Plaintext
Executable File
.settings/org.eclipse.core.resources.prefs
|
|
.project
|
|
.actionScriptProperties
|
|
.flexProperties
|
|
linker-report.xml
|
|
bundles.txt
|
|
build/
|
|
client
|
|
bbbResources.properties.*
|
|
asdoc/
|
|
hs_err_pid*
|
|
html-templateBackup/
|
|
.actionScriptProperties.bak
|
|
.flexProperties.bak
|