BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
371243dbe6
bigbluebutton-Github/bigbluebutton-client/branding/default/style/css
History
Felipe Cecagno 371243dbe6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
2013-06-28 16:09:11 -03:00
..
assets Revert to old fit-to-page button 2013-05-19 17:32:20 -07:00
BBBBlack.css - add a black theme file 2013-03-23 20:48:55 +00:00
BBBDefault.css Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 2013-06-28 16:09:11 -03:00