BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0662a242aa
bigbluebutton-Github/bigbluebutton-client/branding/default/style/css
History
Mateus Dalepiane 0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
2015-04-29 12:10:41 -03:00
..
assets Merge branch 'bigbluebutton/master' into 090-new-videodock 2015-04-29 12:10:41 -03:00
org/bigbluebutton/skins added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
BBBBlack.css on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
BBBDefault.css Merge branch 'bigbluebutton/master' into 090-new-videodock 2015-04-29 12:10:41 -03:00