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
..
spring	Merge branch 'master' into html5-bridge	2013-05-09 17:25:25 +00:00
bigbluebutton.properties	Hide the network monitor and editing buttons for layouts module by defult	2013-04-16 19:23:20 -07:00
BootStrap.groovy	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
BuildConfig.groovy	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
Config.groovy	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
log4j.properties	Added license for bigbluebutton-web	2013-01-18 18:24:35 -05:00
UrlMappings.groovy	Merge branch 'master' into html5-bridge	2013-05-09 17:25:25 +00:00