bigbluebutton-Github/bbb-video/.gitignore
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

6 lines
25 B
Plaintext