bigbluebutton-Github/bigbluebutton-client/branding
Felipe Cecagno 03ba8b2866 Merge branch 'edit-layouts' into mconf-live0.6.2
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_download_16px.png
	bigbluebutton-client/branding/default/style/css/assets/images/ic_file_upload_16px.png
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/BroadcastButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
2015-01-26 11:49:22 -02:00
..
default Merge branch 'edit-layouts' into mconf-live0.6.2 2015-01-26 11:49:22 -02: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.