Anton Georgiev cf125781db Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala		2014-09-02 17:54:14 +00: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	Upping version from 0.9.0-dev to 0.9.0-beta	2014-09-01 17:05:33 -04:00
BigBlueButtonFilters.groovy	- minor cleanup	2014-05-05 18:35:01 +00: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	use high qulity png conversion for the slide, not just the thumbnail	2014-08-07 20:12:55 +00:00