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
..
fs_conf_files/conf
project
src	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch	2018-06-06 08:23:13 -07:00
.gitignore
build.sbt	- update fsesl lib jar version	2017-10-20 08:35:50 -07:00
run.sh	- handle emoji status changed message in client	2017-06-26 12:38:00 -07:00