BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,966 Commits 13 Branches 260 Tags 1.1 GiB
cf09d183ea
Commit Graph

842 Commits

Author SHA1 Message Date
prlanzarin
2ca68218d0 refactor(bbb-conf): remove enableListenOnly check, replace with newer equivalents 
Replace public.kurento.enableListenOnly bbb-conf --check, replace it for the newer equivalent public.media.audio.defaultListenOnlyBridge

Also add defaultFullAudioBridge to the same check
 2022-04-25 18:48:16 +00:00
Anton Georgiev
6f554e9776 fix(conf): setip should not wipe out existing properties 2022-04-11 19:07:11 +00:00
Anton Georgiev
ec1893ba10 chore: Fix typo in bigbluebutton-config/bin/bbb-conf 2022-04-11 15:40:42 +00:00
Fred Dixon
c73943471f Set securitySalt (shared secret) in bbb-web.properties 2022-04-11 13:54:51 +00:00
Paulo Lanzarin
a7c9ab1831
fix(bbb-conf): remove KMS STUN server checks 
Unnecessary in 2.5 (and 2.4 even, but I wont touch that)
 2022-04-04 10:20:18 -03:00
Anton Georgiev
97dbc1aeb6
Merge branch 'v2.5.x-release' into bbb-target 2022-04-01 14:21:15 -04:00
Fred Dixon
da21515982
Update bbb-conf 
Skip commented lines when checking for empty assignment in bbb-conf
 2022-03-27 09:03:12 -04:00
Fred Dixon
8eabe070e6
Update bbb-conf 
Scan only for IPV4 address when cross referencing between FreeSWITCH and Kurento
 2022-03-27 08:48:46 -04:00
Anton Georgiev
6b4a7ff898 refactor: swap netstat with ss 2022-03-23 20:50:19 +00:00
Daniel Molkentin
9c4fc8ccf1 chore: net-tools -> iproute2 
Ensure code duplication is at least documented and end the feature
disparity between files.
 2022-03-22 16:30:43 +01:00
Daniel Molkentin
cd80d891e7 make bbb-conf use bigbluebutton.target 2022-03-17 15:29:40 +01:00
Daniel Molkentin
658b89308d chore: remove obsolete gstream upgrade routine 2022-03-17 15:15:21 +01:00
Anton Georgiev
863c9fb194 build: drop java8 check for xenial 2022-03-16 18:33:06 +00:00
Anton Georgiev
c3242c8003 build: nginx from /usr/share/bigbluebutton/nginx 2022-03-15 02:01:37 +00:00
Anton Georgiev
9e6c078703 build: use tomcat9 not tomcat10 2022-03-14 20:38:31 +00:00
Anton Georgiev
3de540f0ab build: swap bionic with focal 2022-03-14 19:04:23 +00:00
Anton Georgiev
4c7b780d25 build: tomcat8->10 for bbb-demo 2022-03-10 02:09:38 +00:00
Anton Georgiev
16ddf3d5e3 fix: bbb-demo, ship empty bbb_api_conf.jsp, populate in --setip 2022-03-04 17:21:38 +00:00
Anton Georgiev
0233384331 build: drop usage of obsolete settings-production.json 2022-02-27 17:09:19 +00:00
Anton Georgiev
d58b86cbe5 build and config: drop references to tomcat6 or 7 2022-02-27 02:56:27 +00:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Daniel Molkentin
75641f9bee fix: set public.pads.url instead of public.note.url in bbb-conf 
partially fixes #14410
 2022-02-19 17:44:42 +01:00
Anton Georgiev
c930a7e48e
fix: Typo in appy-lib #14398 
Backport of #14398 Thanks @sebastianberm
 2022-02-18 09:00:54 -05:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Fred Dixon
7b687294a4 Added more checks for #14287 2022-02-05 10:05:43 -06:00
Anton Georgiev
6d8491f32e fix(config): correct path for bbb-pads.service 2022-01-25 16:35:45 +00:00
Pedro Beschorner Marin
d7c9112578 feat(pads): add pads to bbb-conf 
Add bbb-pads service to bbb-conf `status`, `start` and `stop` scripts.
 2022-01-25 08:32:18 -03:00
Daniel Petri Rocha
45dd98bfe9 Use yq; show steps in --list-workflows 2022-01-20 18:40:12 +01:00
Daniel Petri Rocha
93360e1fb8 Add post_publish.log check 2022-01-13 13:25:06 +01:00
Daniel Petri Rocha
fb76ea2585 Grep pattern in variable, read-only vars, grep -m instead of | head -n 2022-01-12 15:10:33 +01:00
Daniel Petri Rocha
f9a3a78021 Check raw directory 2022-01-10 22:56:02 +01:00
Daniel Petri Rocha
11015a82b5 Linting with Shellcheck 2022-01-10 19:09:30 +01:00
Daniel Petri Rocha
996b9a8be7 Replace paths with variables 2022-01-08 14:58:47 +01:00
Daniel Petri Rocha
1f53286f48 Option to list available workflows 2022-01-07 15:03:01 +01:00
Daniel Petri Rocha
557043bd21 Playback protocol check 2022-01-07 12:21:44 +01:00
Daniel Petri Rocha
9b1b4aabba Recording permissions and ownership checks 2022-01-07 12:11:17 +01:00
Anton Georgiev
82d8e922cb
Merge pull request #12682 from sapsDev/fixRecordingRewrite 
More robust updates of recordings' "metadata.xml" when issuing "bbb-conf --setip"
 2021-11-19 15:10:32 -05:00
Anton Georgiev
5bf2d712d1
Merge pull request #13429 from prlanzarin/u24-poly-pineapple 
refactor(build, conf): webrtc-sfu's localIpAddress config is defunct
 2021-10-07 08:43:56 -04:00
prlanzarin
2736843537 refactor(conf): webrtc-sfu`s localIpAddress is defunct 2021-10-06 22:52:40 +00:00
Gustavo Trott
7e271c2580 Change condition of sipjsHackViaWs to consider null and undefined values 2021-10-05 16:57:16 -03:00
Anton Georgiev
97014e5f95
Merge branch 'develop' into issue-12530 2021-08-05 16:50:20 -04:00
Joao Siebel
8462465a5f Allow default layout config in bbb-web. close #12668 2021-07-19 11:02:58 -03:00
Steffen Moser
3217d8fce5 Fix bbb-conf --check for multiple STUN servers 2021-06-29 18:03:38 +02:00
Steffen Moser
3fa6df8d41 Fix rewrite recording info in metadata.xml after change of hostname 2021-06-29 13:11:03 +02:00
Anton Georgiev
eabefc459f
Updated link to docs for setup-a-firewall 2021-06-16 15:26:00 -04:00
David Siegfried
80b8fb3255 refine checks and use other overwrites 2021-06-09 11:50:54 +02:00
David Siegfried
afa70b88cf merge kurento-configs 2021-06-09 10:17:13 +02:00
David Siegfried
2003f3984a refine check 2021-06-08 15:40:56 +02:00
David Siegfried
3b3f73d1ec consider bbb-webrtc-sfu-overwrite, fixes #12530 2021-06-08 10:15:54 +02:00
Anton Georgiev
25e5084cd0 fix(bbb-conf):Only show status for multi kurento if that is configured 2021-05-31 20:01:42 +00:00
Fred Dixon
8ade9d1f38
Update bbb-conf 
Minor update to test build
 2021-05-30 10:40:36 -03:00
Anton Georgiev
8cca12df25
Merge pull request #12372 from shashank68/shashank68-bbb-conf-status-nodejs-workers 
Show the status of multiple nodejs workers and kurento media servers in bbb-conf status
 2021-05-21 17:01:51 -04:00
Fred Dixon
fe9eebf616 Run stunclient if it exists 2021-05-13 18:00:00 -05:00
shashank68
94ca0716d7 Show status of parallel kurento media servers in bbb-conf 2021-05-13 10:26:09 +00:00
Shashank D
a4c6e984a1
Show the status of nodejs workers in bbb-conf 
bbb-conf --status will show status of frontend and backend nodejs workers
 2021-05-13 03:36:46 +05:30
Fred Dixon
83e0404746 Fix adding bigbluebutton.web.logoutURL value of default 2021-05-02 09:33:08 -05:00
Calvin Walton
9f5832a5d3 Recording: bbb-record --rebuild restarts processing at the sanity step 
Previously, bbb-record --rebuild was restarting recording processing
from scratch by creating the .../recording/<meeting_id>.done file. This
causes the recording to be reprocessed starting at the archive step.
However, re-running the archive step for an existing meeting is not
really supported! Ever since the segmented recording code was added, it
shouldn't /corrupt/ the recording files, but it's still not good.

And as a side-effect, re-running the archive step will re-create the
.norecord file for meetings without recording marks, meaning that you
cannot use bbb-record --rebuild to force a recording without marks to be
processed.

Switch bbb-record to restart recording processing at the sanity stage to
match the BBB 2.2 behaviour. Rather than have it insert tasks directly
into resque via redis-cli, it goes through a ruby wrapper that performs
input validation and uses the resque apis.
 2021-04-29 11:10:32 -04:00
timm2k
c09788a787
enableMultipleKurentos TasksMax fix 
enableMultipleKurentos TasksMax fix
 2021-04-26 16:03:21 +02:00
Philipp Memmel
8800e58afd consider turn-stun-servers.xml overlay config in /etc/bigbluebutton 2021-04-07 22:44:27 +02:00
hex-m
1d31efe33d
Handle multiple default routes in bbb-conf 
This is the same fix that was made in bbb-install: https://github.com/bigbluebutton/bbb-install/pull/327/

Fix https://github.com/bigbluebutton/bigbluebutton/issues/11452
 2021-04-06 17:04:17 +02:00
Fred Dixon
ce2e5245ed Pickup the correct shared secret when changing bbb-apps-akka.conf 2021-04-03 08:17:44 -05:00
Paul Menzel
d0047ac276 bbb-conf: Fix URL in no-firewall-detected warning 
Fixes: 278223b4e0 ("Recover 2.3-alpha3 version of bbb-conf")
Resolves: https://github.com/bigbluebutton/bigbluebutton/issues/11035
 2021-03-28 09:33:42 +02:00
Fred Dixon
19884b0737 Improve logic for detecting OS in bbb-conf 2021-03-27 14:12:03 -05:00
hiroshisuga
7f2c778f37
Update apply-lib.sh 2021-03-17 00:01:04 +09:00
Fred Dixon
fd2d11ca64 Added detectio for /etc/bigbluebutton/bbb-web.properties 2021-03-11 20:32:00 -06:00
Fred Dixon
af23e30f37 Added text for override of bbb-web.properties 2021-03-07 19:48:08 -06:00
Daniel Schreiber
44b1b9052c fix grep if configfile does not exist 
there was a call of grep which failed when the config file does not
exist yet. check existance of file first.
 2021-03-05 21:56:50 +01:00
Daniel Schreiber
e6f83df3f6 add overlay config for bbb-web 
operators can define their own config for bbb-web which will not be
overwritten by packages.

bbb-conf is changed accordingly to write configuration values to
``/etc/bigbluebutton/bbb-web.properties`
 2021-02-25 14:08:05 +01:00
Anton Georgiev
b8eaf47263
Merge pull request #11454 from schrd/akka-config 
Akka config
 2021-02-23 08:44:00 -05:00
Daniel Schreiber
d53a5f52a5 let bbb-apps-akka read an override config file from /etc/bigbluebutton 
This change introduces a config file
`/etc/bigbluebutton/bbb-fsesl-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades.

bbb-conf is adjusted to deal with this change.
 2021-02-23 12:55:48 +01:00
Daniel Schreiber
f3771268f5 adjust bbb-conf to configure bbb-apps-akka in /etc 
config files from packages should not be changed unless they reside in
/etc
 2021-02-23 12:55:23 +01:00
Anton Georgiev
feb83f57f3 Remove setNumberOfHTML5Processes 2021-02-19 21:51:56 +00:00
Daniel Schreiber
98e994c1c5 adjust bbb-conf to change the secret in /etc 2021-02-19 16:56:42 +01:00
Fred Dixon
e4371bc521 Added STUN check 2021-02-13 20:19:58 -06:00
Fred Dixon
ed56de9567 Restart tomcat8 2020-12-18 18:47:59 -06:00
Anton Georgiev
278223b4e0
Recover 2.3-alpha3 version of bbb-conf 
Most of the changes date back to #10700 
We were trying to trace down a problematic change likely when merging 2.2.31 into 2.3 ( #11033 )
If anyone spots issues with bbb-conf on their 2.3 server, please comment
 2020-12-18 18:38:46 -05:00
Fred Dixon
17c5ea9aed Fixup bbb-conf for 2.3-alpha3 2020-12-18 16:41:08 -06:00
Anton Georgiev
998eea6ec4
Changed a few more http links to https 2020-12-18 10:53:51 -05:00
Dennis1993
ef4e871638
Update URL to HTTPS 
Change http:// to https://
 2020-12-18 16:45:18 +01:00
Anton Georgiev
c1ffced27d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop 2020-12-17 21:14:29 +00:00
Fred Dixon
1105e85456 Removed extra fi 2020-12-12 15:49:26 -06:00
Fred Dixon
c99834f187 Echo STUN server if enabled 2020-12-12 15:35:14 -06:00
Fred Dixon
053eba27b0 Provide shorter audio prompts for muted/unmuted 2020-12-12 11:15:14 -06:00
Fred Dixon
3424c5b7c9
Merge pull request #10900 from wmchris/develop 
The first element of "hostname -I" is not intended to receive the primary IP address in bbb-conf
 2020-12-10 20:51:17 -04:00
lonesomewalker
9a399fe86d
Update apply-lib.sh 
fixed typo
 2020-12-10 01:53:45 +01:00
Fred Dixon
778cc08fd6
Merge pull request #9489 from beckerr-rzht/develop 
[FIX] playback doesn't start in iPadOS   and   [FIX] `bb-record --check` is broken
 2020-12-05 16:25:37 -05:00
Anton Georgiev
778c20d205 Added setNumberOfHTML5Processes to apply-lib.sh 2020-12-04 19:56:16 +00:00
beckerr-rzht
9eee10eee1
Merge branch 'develop' into develop 2020-12-04 09:45:21 +01:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
timm2k
0586cce81f
Empty After= may confuses systemd 
Empty After= may confuses systemd
 2020-12-01 15:52:41 +01:00
Lars Kiesow
b24acfdef2
Fix Typo in bbb-record 
This patch fixes a typo in bbb-record causing problems by checking the
bigbluebtuuon user.
 2020-11-30 13:44:10 +01:00
Fred Dixon
4dc33a2ac6 Mask output of which command 2020-11-27 15:40:44 -06:00
Christian Uhl
ded1b3e7b2 fixed indentation 2020-11-25 14:20:25 +01:00
Christian Uhl
af55f21284 The first element of "hostname -I" is not intended to receive the primary IP address in bbb-conf 2020-11-25 14:18:33 +01:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
e37e1aa55a Don't warn about sip.js if sipjsHackViaWs=true 2020-11-23 19:52:21 -06:00
Fred Dixon
0a4726bfcf Added check for default stun.freeswitch.org 2020-11-23 07:11:06 -06:00
Lars Kiesow
7a59069958
Allow user bigbluebutton to delete recordings 
This patch modifies `bbb-record` allowing the user `bigbluebutton` to
delete recordings. The user has all necessary access rights, meaning
that the deletion works without a problem and the check for root does
not protect anything. The users owns the data after all. The current
check just makes things less convenient.
 2020-11-16 23:58:47 +01:00
Lars Kiesow
c7bdfc09c6
Style of bbb-record 
Currently, `bbb-record` uses a bunch of different style for indentation,
sometimes tabs, sometimes to, three or four spaces and these are
sometimes mixed on a line by line basis, making it hard to read and to
get what's going on.

This is a simple patch making the style of `bbb-record` consistent by
using three spaces for indentation which seemed to be the most commonly
used type of indentation here.
 2020-11-16 23:39:25 +01:00
Mario Jr
ebe9b3a789 Increase private key size for dtls-srtp.pem to 4096 
Using this larger value helps reducing ocurrences 1005/1010 errors for Chrome, avoiding an openssl's error which interrupts the dtls handshake (Chrome triggers "DTLS timeout expired" error)
This key size is also the default value used by freeswitch on switch_core_cert.c
 2020-11-12 16:59:45 -03:00
Fred Dixon
74186dcd0e Don't check for libreoffice on bionic 2020-10-26 20:43:58 -05:00
Anton Georgiev
a2f437a5b7 Print "BlueButton Server 2.3.0-dev (1383)" as part of bbb-conf --version 2020-10-22 14:40:19 +00:00
Anton Georgiev
be47d732e9 Removed warning for LibreOffice on port 8100 2020-10-22 13:39:15 +00:00
Anton Georgiev
01f5a061ba remove traces of red5 apps, flash client, etc 2020-10-22 13:30:51 +00:00
Fred Dixon
47f2b10f2b bbb-webrtc-sfu wait for multiple Kurentos 2020-10-18 14:30:13 -05:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
Fred Dixon
869a4a5c59
Merge branch 'v2.2.x-release' into always-gen-certificate 2020-09-16 10:20:28 -04:00
Fred Dixon
7867bcf725 Always generate certificate for Kurento 2020-09-16 09:17:31 -05:00
Fred Dixon
8df5637c56 Ensure the path is always updated 2020-09-16 08:32:08 -05:00
Fred Dixon
1ad1bb0529 Fix #10467 2020-09-16 08:25:06 -05:00
Fred Dixon
fcd3d23126 Fix #10467 2020-09-16 08:23:53 -05:00
Anton Georgiev
612f37fa2b
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination 
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination
 2020-09-15 14:45:25 -04:00
Fred Dixon
8c21eca5dd properly update ESL password 2020-09-14 16:19:46 -05:00
Fred Dixon
0368dd2c1a Add option for three parallel KMS servers 2020-09-13 11:38:22 -05:00
Fred Dixon
073a63827a Add option for three parallel KMS servers 2020-09-13 11:36:07 -05:00
Fred Dixon
3c37babfeb Add option for three parallel KMS servers 2020-09-13 10:47:28 -05:00
timm2k
dacffff831 Also delete opus files in freeswitch cache dir 
Only wav files in freeswitch cache directory were deleted. With this PR also opus files are deleted.
 2020-08-31 11:02:12 -04:00
timm2k
bcd221b173
Also delete opus files in freeswitch cache dir 
Only wav files in freeswitch cache directory were deleted. With this PR also opus files are deleted.
 2020-08-28 08:21:00 +02:00
Fred Dixon
65d7e6c954 Remove bbb-transcode-akka from monitoring 2020-08-27 17:13:15 -05:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Ghazi Triki
b4c80b8572 Collect more bigbluebutton nginx access logs in bbb-conf --zip 2020-07-15 09:31:45 +01:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Fred Dixon
7d42aa0ea6
Merge pull request #9578 from znerol-forks/feature/develop/config-support-default-server-name 
bbb-conf: respect underscore in nginx server_name
 2020-07-05 16:02:52 -04:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
Fred Dixon
db9ed99ea7 Ensure ESL password is updated 2020-06-30 12:17:12 -05:00
Joao Siebel
3896d0cb5a Remove warning about unsupported defaultGuestPolicy in HTML5 client 2020-06-23 12:01:26 -03:00
mw781
eb29e5b973 Remove trailing whitespace 2020-06-18 13:32:49 +01:00
mw781
fb031c1690 Fix regex issue with firewall troubleshooting 2020-06-18 13:31:10 +01:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Fred Dixon
1d3bfba23b Don't print out new FreeSWITCH ESL password 2020-06-13 06:41:29 -05:00
Fred Dixon
fa730b726a Update default freeSWITCH ESL Password 2020-06-07 10:48:25 -05:00
Fred Dixon
3d6bedc613 Only check for Java 8 on xenial 2020-06-07 10:22:55 -05:00
Ioannis Cherouvim
15b62f9427
Typo fix on kurento error message. 2020-06-04 10:51:50 +03:00
Anton Georgiev
82930ad4bd
Merge pull request #9672 from antobinary/merge-2.2-into-develop 
Merge 2.2 into develop, May 25, 2020
 2020-05-25 15:44:33 -04:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Fred Dixon
dc4cc11a8a Use the specified ESL password 2020-05-24 11:20:25 -05:00
Fred Dixon
bcf2b83c7f
Update bbb-record 
Fix #9652
 2020-05-23 12:49:22 -04:00
nough
590341cf1d
removing /tmp/t_net after --network finished 
as suggested in https://github.com/bigbluebutton/bigbluebutton/issues/9069
 2020-05-20 09:21:26 +01:00
znerol
858361b10e Support underscore in nginx server_name 2020-05-17 17:34:20 +02:00
Fred Dixon
b257e34d9d Check for kurento.sip_ip is correct 2020-05-16 08:45:27 -05:00
Fred Dixon
6af3a41c5d
Update bbb-conf 
Added display of kurento.sip_ip
 2020-05-13 08:39:32 -04:00
beckerr-rzht
c97560bcfd
[FIX] bbb-record --check is broken 
`bbb-record --check` always complains about:
```
# The hostname in <link> .. </link> (xxx)
# do not match the hostname for bigbluebutton.web.serverURL
```
This is because `grep` is not able to get the value of the '<link>` tag. 
Since `grep` is always a bad idea when it comes to `xml` files, I'm using `xmlstarlet` as a robust solution.
 2020-05-10 18:17:54 +02:00
nough
23508f2727
added port 443 to bbb-conf --network command. 
Our BBB instance is fully https encrypted, so there are no connections on port 80, and it seems that flash and therefore port 1935 is fully deprecated. by adding port 443, we can actually see what connections are being made at the moment.
 2020-04-29 13:16:28 +01:00
Fred Dixon
2f957f5809 Fix version on index.html 2020-03-06 05:30:04 -06:00
Felipe Cecagno
ce3b55d1da update gstreamer was only being triggered by --restart, include it to --setip and --clean 2020-03-05 23:47:42 -03:00
Felipe Cecagno
8e43acdf1f limit execution to xenial; add a TODO to remove it on 2.3 or above 2020-03-05 23:19:45 -03:00
Felipe Cecagno
91fb274c35 do not test a specific version, let it go through all the gstreamer packages 2020-03-05 22:42:21 -03:00
Felipe Cecagno
f6e26cf8af force update gstreamer packages 2020-03-05 22:39:25 -03:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00