Richard Alam a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch ... - some conflicts have been fixed. The following needs working on: both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml Parking as need to work on something else.		2018-06-06 08:23:13 -07:00
..
core	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch	2018-06-06 08:23:13 -07:00
podcast/scripts	Fix some syntax issues	2018-04-26 15:24:16 -04:00
presentation	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch	2018-06-06 08:23:13 -07:00
presentation_export	Updating presentation_export with closed caption feature	2017-03-22 19:20:20 +00:00
screenshare	RnP: Fix bitrate in screenshare.yml	2018-05-11 11:58:54 -04:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!	2017-04-03 17:06:16 +00:00