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
..
conf	Merge branch 'master' into ref-bbb-web-2	2011-06-16 14:49:57 -04:00
controllers/org/bigbluebutton/web/controllers	- now DI works fine...had to delete bin and target dirs remnants from maven build	2011-06-15 17:28:31 -04:00
i18n	- bringing bigbluebutton-web into trunk	2009-04-01 16:53:45 +00:00
services/org/bigbluebutton/web/services	- merging changes from Markos	2011-06-16 09:28:14 -04:00
views	- bbb-scheduling has been removed from bbb-web	2010-07-19 19:27:24 +00:00