bigbluebutton-Github/bigbluebutton-client/branding/default
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
..
style/css Merge branch 'edit-layouts' into mconf-live0.6.2 2015-01-26 11:49:22 -02:00
build.xml changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
README - add README 2012-12-27 21:46:06 +00:00

 This is the default BigBlueButton style.