BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9a7bae79a8
bigbluebutton-Github/bigbluebutton-client/branding/default/style/css
History
Felipe Cecagno 9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
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/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.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/ToolbarButton.mxml
	record-and-playback/deploy.sh
2015-01-28 20:33:28 -02:00
..
assets Merge branch '090-new-videodock' into HEAD 2015-01-28 20:33:28 -02: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 '090-new-videodock' into HEAD 2015-01-28 20:33:28 -02:00