Richard Alam 8ba1e6484a Merge branch 'master' into ref-bbb-web-2 ... 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		2011-06-16 14:49:57 -04:00
..
spring	- cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel	2011-06-16 10:46:59 -04:00
bigbluebutton.properties	Merge branch 'master' into ref-bbb-web-2	2011-06-16 14:49:57 -04:00
BootStrap.groovy	- fixed few issues and cleaned up	2010-07-19 20:23:28 +00:00
BuildConfig.groovy	- fix logging when deployed to tomcat	2010-01-07 17:29:12 +00:00
Config.groovy	- remove bigbluebutton.properties override	2011-05-27 11:36:10 -04:00
log4j.properties	- fix logging when deployed to tomcat	2010-01-07 17:29:12 +00:00
UrlMappings.groovy	- Removed bbb-web scheduler	2010-07-19 19:15:01 +00:00