a3acb00893
Conflicts: bbb-video/build.gradle bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-config/web/default.pdf |
||
---|---|---|
.. | ||
spring | ||
ApplicationResources.groovy | ||
bigbluebutton.properties | ||
BigBlueButtonFilters.groovy | ||
BootStrap.groovy | ||
BuildConfig.groovy | ||
Config.groovy | ||
DataSource.groovy | ||
UrlMappings.groovy |