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
..
core	Merge pull request #428 from mconf/rap-publish-events	2014-11-14 12:08:44 -02:00
matterhorn	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
presentation	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	fixed the deploy script used to deploy the rap dev environment	2014-11-12 17:21:54 -02:00