Felipe Cecagno 79e513b38f Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css 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/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml		2014-03-12 21:58:15 -03:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles	2014-03-12 21:58:15 -03:00
config.xml.template	Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles	2014-03-12 21:58:15 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00