Felipe Cecagno 5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml		2014-10-05 22:00:28 -03:00
..
spring	- provide a way to support pre-built config.xml	2014-08-20 11:42:31 -07:00
ApplicationResources.groovy	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
bigbluebutton.properties	cleanup	2014-09-04 15:02:16 -03: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	- allow a way to change log level externally from bigbluebutton.properties	2014-08-23 13:04:06 -07:00
DataSource.groovy	- remove datasource config	2014-02-25 20:06:00 +00:00
UrlMappings.groovy	- fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow	2014-04-02 16:17:24 +00:00