8ba1e6484a
Conflicts: bbb-video/.gitignore bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java bigbluebutton-web/grails-app/conf/bigbluebutton.properties bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
6 lines
25 B
Plaintext
6 lines
25 B
Plaintext
bin
|
|
build
|
|
dist
|
|
lib
|
|
build
|