bigbluebutton-Github/bigbluebutton-web/grails-app/conf
Felipe Cecagno a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -02:00
..
spring - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
ApplicationResources.groovy - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
bigbluebutton.properties Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-24 23:38:09 -02:00
BigBlueButtonFilters.groovy - return false when filter is applied 2014-09-14 09:06:11 -07:00
BootStrap.groovy - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
BuildConfig.groovy - modify messages 2014-05-09 17:49:01 -07:00
Config.groovy - increase log file size and number of backups kept 2014-10-12 05:43:18 -07:00
DataSource.groovy - remove datasource config 2014-02-25 20:06:00 +00:00
UrlMappings.groovy - return api version when url is http://<host>/bigbluebutton 2014-10-27 19:01:01 +00:00