Richard Alam be8befb243 Merge branch 'master' into html5-bridge ... Conflicts: bigbluebutton-apps/build.gradle bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java		2013-05-09 17:25:25 +00:00
..
conf	Merge branch 'master' into html5-bridge	2013-05-09 17:25:25 +00:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'master' into html5-bridge	2013-05-09 17:25:25 +00:00
i18n	- bringing bigbluebutton-web into trunk	2009-04-01 16:53:45 +00:00
services/org/bigbluebutton/web/services	Merge almost complete. Still red dot not working	2013-01-25 21:50:32 -05:00
views	- bbb-scheduling has been removed from bbb-web	2010-07-19 19:27:24 +00:00