BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8702b42def
bigbluebutton-Github/bigbluebutton-client/branding
History
Chad Pilkey 8702b42def Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2013-02-19 13:45:50 -05:00
..
default Merge remote branch 'upstream/master' into access-hotfix 2013-02-19 13:45:50 -05:00
README - add default skin/style 2012-12-27 20:27:29 +00:00

README 

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