Ghazi Triki 66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml # bigbluebutton-config/bigbluebutton-release # bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)		2018-07-16 16:08:38 +01:00
..
api	Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master	2014-05-12 17:31:35 +00:00
applet-jni	Initial commit of applet-jni test.	2012-08-03 07:22:16 -03:00
bbb-api-php	Rename README to README.md to force its parcing	2016-03-10 22:03:17 +01:00
bbb-deskshare-installer	Initial commit of installer folder.	2012-08-07 12:07:11 -03:00
bbb-deskshare-udp	Initial Commit	2012-08-06 17:16:47 -03:00
bbb-webrtc-sfu	Added missing MEDIA_SERVER_OFFLINE event and resolve	2018-07-10 17:21:26 +00:00
html5-embed	- add example in 3rd party html to lock unlock layout	2012-11-01 18:45:51 +00:00
stress-testing	old firefox CLI call not working on newer versions, updated to a newer one	2017-03-08 22:15:23 +03:00
vertx-akka	- make sure message from user actor to client actor is routed properly	2018-04-26 12:41:02 -07:00
webminer	- cleanup and move webminer into labs	2011-05-22 15:59:33 -04:00