BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96d4037ab0
bigbluebutton-Github/record-and-playback/slides/scripts/publish
History
Chad Pilkey cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2012-08-07 19:56:23 +00:00
..
slides.rb Merge remote branch 'upstream/master' 2012-08-07 19:56:23 +00:00