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
..
doc-conversion.xml	Merge almost complete. Still red dot not working	2013-01-25 21:50:32 -05:00
resources.groovy	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
resources.xml	Merge branch 'master' into merge-master-into-dynamic-config	2013-03-15 21:03:13 +00:00