bigbluebutton-Github/bigbluebutton-client/branding
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
..
default Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles 2014-03-12 21:58:15 -03:00
README - add default skin/style 2012-12-27 20:27:29 +00:00

This is the directory where you should put your custom skinning/styling.