BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79c3c12256
bigbluebutton-Github/bigbluebutton-client/branding/default
History
Felipe Cecagno 79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
2016-09-14 14:49:48 -03:00
..
style/css Merge branch 'merge-presentation-deskshare' into mconf 2016-09-14 14:49:48 -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.