BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cbb4a167bb
bigbluebutton-Github/bigbluebutton-client/branding/default/style/css
History
Mateus Dalepiane cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
2014-08-26 17:20:00 -03:00
..
assets Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 2014-08-26 17:20:00 -03:00
org/bigbluebutton/skins Added a follower tooltip with an indicator arrow. 2014-08-13 23:08:03 +01:00
BBBBlack.css properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
BBBDefault.css Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 2014-08-26 17:20:00 -03:00