Jorge Nunez 5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge ... Conflicts: bigbluebutton-web/grails-app/conf/bigbluebutton.properties		2013-07-31 17:27:33 -07:00
..
spring	Merge branch 'master' into html5-bridge	2013-05-09 17:25:25 +00:00
bigbluebutton.properties	Merge remote branch 'upstream/master' into html5-bridge	2013-07-31 17:27:33 -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
DataSource.groovy	try to upgrade to grails 1.3.9 - Not starting properly though	2013-06-06 12:17:52 -07: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