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
..
project	- try writing test	2017-07-14 14:50:34 -07:00
scala	First pass moving breakout rooms messages to v2 format.	2017-06-12 20:32:10 +01:00
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	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	- remove akka http prototype as redis scala is incompatible with the latest akka release	2017-10-03 08:36:18 -07:00
run.sh	- handle emoji status changed message in client	2017-06-26 12:38:00 -07:00