BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
09c4ffcbe1
bigbluebutton-Github/bigbluebutton-client/branding/default
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
..
style/css Merge branch 'bigbluebutton/master' into 090-new-videodock 2015-04-29 12:10:41 -03:00
build.xml changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
README - add README 2012-12-27 21:46:06 +00:00

README 

 This is the default BigBlueButton style.