cbe0ee60cc
Conflicts: bigbluebutton-web/.gitignore |
||
---|---|---|
.. | ||
spring | ||
bigbluebutton.properties | ||
BootStrap.groovy | ||
BuildConfig.groovy | ||
Config.groovy | ||
log4j.properties | ||
UrlMappings.groovy |
cbe0ee60cc
Conflicts: bigbluebutton-web/.gitignore |
||
---|---|---|
.. | ||
spring | ||
bigbluebutton.properties | ||
BootStrap.groovy | ||
BuildConfig.groovy | ||
Config.groovy | ||
log4j.properties | ||
UrlMappings.groovy |