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
..
process	starting to make playback accessible	2012-08-03 20:10:54 +00:00
publish	Merge remote branch 'upstream/master'	2012-08-07 19:56:23 +00:00
slides.nginx	- rename simple playback to slides playback	2011-07-19 14:33:17 -04:00
slides.yml	- rename simple playback to slides playback	2011-07-19 14:33:17 -04:00